From eca2c70e3c8a9ee285daeb0060fa71fead03cb16 Mon Sep 17 00:00:00 2001
From: Peter Xu <peterxura@gmail.com>
Date: Wed, 7 Aug 2019 12:50:19 -0700
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8New=20Tabs=20Page:=20Enable=20NTP=20to?=
 =?UTF-8?q?=20be=20theme=20aware;=20closes=20https://github.com/brave/brav?=
 =?UTF-8?q?e-browser/issues/5014?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/extensions/api/_api_features.json      |  3 +-
 components/brave_new_tab_ui/brave_new_tab.tsx | 30 ++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/common/extensions/api/_api_features.json b/common/extensions/api/_api_features.json
index 5a9612c3c289..ab2e1c70fb1a 100644
--- a/common/extensions/api/_api_features.json
+++ b/common/extensions/api/_api_features.json
@@ -105,7 +105,8 @@
     "contexts": ["webui"],
     "matches": [
       "chrome://welcome/*",
-      "chrome://settings/*"
+      "chrome://settings/*",
+      "chrome://newtab/*"
     ]
   }]
 }
diff --git a/components/brave_new_tab_ui/brave_new_tab.tsx b/components/brave_new_tab_ui/brave_new_tab.tsx
index 56461eb4e5be..a4aca28665b6 100644
--- a/components/brave_new_tab_ui/brave_new_tab.tsx
+++ b/components/brave_new_tab_ui/brave_new_tab.tsx
@@ -7,7 +7,8 @@ import * as React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'
 import Theme from 'brave-ui/theme/brave-default'
-import { ThemeProvider } from 'brave-ui/theme'
+import DarkTheme from 'brave-ui/theme/brave-dark'
+import BraveCoreThemeProvider from '../common/BraveCoreThemeProvider'
 import wireAPIEventsToStore from './apiEventsToStore'
 
 // Components
@@ -24,15 +25,24 @@ import '../fonts/muli.css'
 function initialize () {
   console.timeStamp('loaded')
   // Get rendering going
-  render(
-    <Provider store={store}>
-      <ThemeProvider theme={Theme}>
-        <App />
-      </ThemeProvider>
-    </Provider>,
-    document.getElementById('root'),
-    () => console.timeStamp('first react render')
-  )
+  new Promise(resolve => chrome.braveTheme.getBraveThemeType(resolve))
+  .then((themeType: chrome.braveTheme.ThemeType) => {
+    render(
+      <Provider store={store}>
+        <BraveCoreThemeProvider
+          initialThemeType={themeType}
+          dark={DarkTheme}
+          light={Theme}
+        >
+          <App />
+        </BraveCoreThemeProvider>
+      </Provider>,
+      document.getElementById('root'),
+      () => console.timeStamp('first react render'))
+  })
+  .catch((error) => {
+    console.error('Problem mounting brave new tab', error)
+  })
   window.i18nTemplate.process(window.document, window.loadTimeData)
 }