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"
@@ skipping 432 matching lines @@
   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)
   // 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) {
+  if (!params->parent && !params->context && !params->child)
     params->native_widget = new views::DesktopNativeWidgetAura(delegate);
-  } else if (use_non_toplevel_window) {
-    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 {
+  else if (use_non_toplevel_window)
+    params->native_widget = new views::NativeWidgetAura(delegate);
+  else
     params->native_widget = new views::DesktopNativeWidgetAura(delegate);
+  gfx::NativeWindow window = params->parent ? params->parent : params->context;
+  if (window) {
+    auto* native_widget = static_cast<views::internal::NativeWidgetPrivate*>(

[sky, 2017/01/31 05:14:31]

Sorry, one more. While params->native_widget is definitely a
NativeWidgetPrivate, NativeWidgetPrivate is meant only to be used by Widget. So,
please put put the SetNativeWindowProperty() calls in each branch above. If you
combine the branches there isn't as much code duplication, e.g.:

gfx::NativeWindow parent_or_context = (what you call parent);
if (!params->parent && !params->context && !params->child &&
!use_non_toplevel_window) {
  create DesktopNativeWidgetAura;
} else {
  Create NativeWidgetAura;
}

+        params->native_widget);
+    native_widget->SetNativeWindowProperty(
+        Profile::kProfileKey,
+        window->GetNativeWindowProperty(Profile::kProfileKey));
   }
 #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 94 matching lines @@
   return ViewsDelegate::GetBubbleDialogMargins();
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif