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

chrome/browser/ui/views/chrome_views_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 
 #include <memory>
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser_window_state.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 405 matching lines @@
   // There may be a few remaining widgets in Chrome OS that are not top level,
   // but have neither a context nor a parent. Provide a fallback context so
   // users don't crash. Developers will hit the DCHECK and should provide a
   // context.
   if (params->context)
     params->context = params->context->GetRootWindow();
   DCHECK(params->parent || params->context || !params->child)
       << "Please provide a parent or context for this widget.";
   if (!params->parent && !params->context)
     params->context = ash::Shell::GetPrimaryRootWindow();
-#elif defined(USE_AURA)
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)

[sky, 2017/02/16 22:10:32]

Won't this break windows? By that I mean windows no longer hits this branch,
right?

[Tom (Use chromium acct), 2017/02/17 00:35:31]

windows no longer hits this branch

based on your email, I thought you meant to remove it:
"In looking at the patch again I think inheriting the profile from the
parent/context is problematic. We don't always want it (the task
manager is a good example of that, no doubt there are others). I think
we should be explicit and not attempt to infer the profile."

But I think I misinterpreted what you said, so I've added inheriting the
profile back on Windows.

   // While the majority of the time, context wasn't plumbed through due to the
   // existence of a global WindowParentingClient, if this window is toplevel,
   // it's possible that there is no contextual state that we can use.
-  if (params->parent == NULL && params->context == NULL && !params->child) {
-    params->native_widget = new views::DesktopNativeWidgetAura(delegate);
-  } else if (use_non_toplevel_window) {
+  gfx::NativeWindow parent_or_context =
+      params->parent ? params->parent : params->context;
+  void* profile = nullptr;
+  const char* key = BrowserView::kThemeProfileKey;
+  if (parent_or_context)
+    profile = parent_or_context->GetNativeWindowProperty(key);
+  if ((!params->parent && !params->context && !params->child) ||
+      !use_non_toplevel_window) {
+    views::DesktopNativeWidgetAura* native_widget =
+        new views::DesktopNativeWidgetAura(delegate);
+    params->native_widget = native_widget;
+    native_widget->SetNativeWindowProperty(key, profile);
+  } else {
     views::NativeWidgetAura* native_widget =
         new views::NativeWidgetAura(delegate);
-    if (params->parent) {
-      Profile* parent_profile = reinterpret_cast<Profile*>(
-          params->parent->GetNativeWindowProperty(Profile::kProfileKey));
-      native_widget->SetNativeWindowProperty(Profile::kProfileKey,
-                                             parent_profile);
-    }
     params->native_widget = native_widget;
-  } else {
-    params->native_widget = new views::DesktopNativeWidgetAura(delegate);
+    native_widget->SetNativeWindowProperty(key, profile);
   }
 #endif
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
   // On Ubuntu Unity, the system always provides a title bar for maximized
   // windows.
   views::LinuxUI* ui = views::LinuxUI::instance();
   return maximized && ui && ui->UnityIsRunning();
@@ skipping 100 matching lines @@
       LayoutDelegate::Metric::PANEL_CONTENT_MARGIN));
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif