Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(698)

Unified Diff: chrome/browser/ui/views/frame/browser_frame.cc

Issue 2473863004: Remove MaterialDesignController::IsModeMaterial (Closed)
Patch Set: pkasting review and rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index c5ede6ab791459cdb27d0c4b7d72b6948a6efd68..c14713e8e9f761832666512b86b11370c0748860 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -28,13 +28,13 @@
#include "ui/base/hit_test.h"
#include "ui/events/event_handler.h"
#include "ui/gfx/font_list.h"
+#include "ui/native_theme/native_theme_dark_aura.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/widget/native_widget.h"
#if defined(OS_CHROMEOS)
#include "ash/common/session/session_state_delegate.h" // nogncheck
#include "ash/common/wm_shell.h" // nogncheck
-#include "ui/native_theme/native_theme_dark_aura.h" // nogncheck
#endif
#if defined(OS_LINUX)
@@ -45,10 +45,6 @@
#include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
#endif
-#if defined(OS_WIN)
-#include "ui/native_theme/native_theme_dark_win.h"
-#endif
-
////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public:
@@ -183,16 +179,14 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
}
const ui::NativeTheme* BrowserFrame::GetNativeTheme() const {
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
if (browser_view_->browser()->profile()->GetProfileType() ==
Profile::INCOGNITO_PROFILE &&
ThemeServiceFactory::GetForProfile(browser_view_->browser()->profile())
->UsingDefaultTheme()) {
-#if defined(OS_WIN)
- return ui::NativeThemeDarkWin::instance();
-#elif defined(OS_CHROMEOS)
return ui::NativeThemeDarkAura::instance();
-#endif
}
+#endif
return views::Widget::GetNativeTheme();
}
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698