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

Unified Diff: chrome/browser/ui/views/frame/browser_view.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_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 59b92742aad928962c2304761d59d0be57917df2..26b2d1adbc4d48d386943732398b6b8e52fea222 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -138,6 +138,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/scoped_canvas.h"
+#include "ui/native_theme/native_theme_dark_aura.h"
#include "ui/strings/grit/ui_strings.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/textfield/textfield.h"
@@ -169,7 +170,7 @@
#include "chrome/browser/win/jumplist.h"
#include "chrome/browser/win/jumplist_factory.h"
#include "ui/gfx/color_palette.h"
-#include "ui/native_theme/native_theme_dark_win.h"
+#include "ui/native_theme/native_theme_win.h"
#include "ui/views/win/scoped_fullscreen_visibility.h"
#endif
@@ -179,7 +180,6 @@
#endif
#if defined(OS_LINUX)
-#include "ui/native_theme/native_theme_dark_aura.h"
#endif
using base::TimeDelta;
@@ -1906,11 +1906,10 @@ void BrowserView::OnThemeChanged() {
// the usage of dark or normal hinges on the browser theme), so we have to
// propagate both kinds of change.
base::AutoReset<bool> reset(&handling_theme_changed_, true);
+ ui::NativeThemeDarkAura::instance()->NotifyObservers();
#if defined(OS_WIN)
- ui::NativeThemeDarkWin::instance()->NotifyObservers();
ui::NativeThemeWin::instance()->NotifyObservers();
#elif defined(OS_LINUX)
- ui::NativeThemeDarkAura::instance()->NotifyObservers();
ui::NativeThemeAura::instance()->NotifyObservers();
#endif
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/infobars/infobar_background.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698