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

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

Issue 2697513008: Linux Aura: Use Aura theme on all windows when 'Use Classic theme' is used (Closed)
Patch Set: Move kThemeProfileKey into c/b/ui/views/frame/browser_view.h Created 3 years, 10 months 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 d0efcd3620c14b9c25d565f1c4fbcf23e3acd526..2b4cdd6eef6cd74c3ef7cb1be21957e567c8d3cf 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -174,9 +174,6 @@
#include "chrome/browser/ui/views/sync/one_click_signin_dialog_view.h"
#endif
-#if defined(OS_LINUX)
-#endif
-
using base::TimeDelta;
using base::UserMetricsAction;
using content::NativeWebKeyboardEvent;
@@ -385,6 +382,9 @@ void BookmarkBarViewBackground::Paint(gfx::Canvas* canvas,
// static
const char BrowserView::kViewClassName[] = "BrowserView";
+// static
+const char BrowserView::kThemeProfileKey[] = "__THEME_PROFILE__";
+
BrowserView::BrowserView()
: views::ClientView(nullptr, nullptr),
last_focused_view_storage_id_(
@@ -2031,6 +2031,11 @@ void BrowserView::InitViews() {
GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
browser_->profile());
+ // Stow a pointer to the browser's original profile onto the window handle so
+ // that windows will be styled with the appropriate NativeTheme.
+ GetWidget()->SetNativeWindowProperty(
+ BrowserView::kThemeProfileKey, browser_->profile()->GetOriginalProfile());
+
LoadAccelerators();
contents_web_view_ = new ContentsWebView(browser_->profile());

Powered by Google App Engine
This is Rietveld 408576698