[MD] Don't use new OTR native-theming when using a custom browser theme.

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/aura/env.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/pref_names.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
@@ skipping 12 matching lines @@
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
   if (!window)
     return nullptr;
 
   Profile* profile = nullptr;
   // Window types not listed here (such as tooltips) will never use Chrome
   // theming.
   if (window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
-      window->type() == ui::wm::WINDOW_TYPE_POPUP ||
-      window->type() == ui::wm::WINDOW_TYPE_CONTROL) {
+      window->type() == ui::wm::WINDOW_TYPE_POPUP) {
     profile = reinterpret_cast<Profile*>(
         window->GetNativeWindowProperty(Profile::kProfileKey));
   }
 
-  if (profile && !profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme)) {
-    // Only toplevel browser windows and CONTROL type windows (such as the find
-    // in page bar) should use special theming for off the record mode.
-    // WINDOW_TYPE_NORMAL is not enough to distinguish browser windows because
-    // it also encompasses dialogs.
-    bool eligible_for_otr = window->type() == ui::wm::WINDOW_TYPE_CONTROL ||
-                            BrowserView::GetBrowserViewForNativeWindow(window);
-    if (eligible_for_otr &&
-        profile->GetProfileType() == Profile::INCOGNITO_PROFILE) {
-      return ui::NativeThemeDarkAura::instance();
+  if (profile) {
+    ThemeService* ts = ThemeServiceFactory::GetForProfile(profile);
+    // If using the system (GTK) theme, don't use an Aura NativeTheme at all.
+    if (!ts->UsingSystemTheme()) {
+      // Use a dark theme for incognito browser windows that aren't
+      // custom-themed. Otherwise, normal Aura theme.
+      if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE &&
+          ts->UsingDefaultTheme() &&
+          BrowserView::GetBrowserViewForNativeWindow(window)) {
+        return ui::NativeThemeDarkAura::instance();
+      }
+
+      return ui::NativeThemeAura::instance();
     }
-
-    return ui::NativeThemeAura::instance();
   }
 
   return nullptr;
 }
 #endif
 
 #if !defined(OS_CHROMEOS) && defined(USE_ASH)
 // Returns the desktop this process was initially launched in.
 chrome::HostDesktopType GetInitialDesktop() {
 #if defined(OS_WIN) && defined(USE_ASH)
@@ skipping 106 matching lines @@
                            chrome::MESSAGE_BOX_TYPE_WARNING);
 
     // Avoids gpu_process_transport_factory.cc(153)] Check failed:
     // per_compositor_data_.empty() when quit is chosen.
     base::RunLoop().RunUntilIdle();
 
     exit(EXIT_FAILURE);
   }
 }
 #endif