Linux Aura: Use Aura theme on all windows when 'Use Classic theme' is used

chrome/browser/ui/views/frame/browser_view.cc

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..d755355ee3f5148dddd5cf181e883ab000bef1ea 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -155,6 +155,7 @@
 #endif  // !defined(OS_CHROMEOS)
 
 #if defined(USE_AURA)
+#include "chrome/browser/ui/views/theme_profile_key.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ -174,9 +175,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;
@@ -2031,6 +2029,13 @@ void BrowserView::InitViews() {
   GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
                                        browser_->profile());
 
+#if defined(USE_AURA)
+  // Stow a pointer to the browser's original profile onto the window handle so
+  // that windows will be styled with the appropriate NativeTheme.
+  ThemeProfileKey::SetThemeProfileForWindow(
+      GetNativeWindow(), browser_->profile()->GetOriginalProfile());
+#endif
+
   LoadAccelerators();
 
   contents_web_view_ = new ContentsWebView(browser_->profile());