GTK: Apply browser theme to TYPE_CONTROL windows

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 "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
@@ skipping 28 matching lines @@
 
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
 
 namespace {
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
   if (!window)
-    return NULL;
+    return nullptr;
 
-  Profile* profile = NULL;
+  Profile* profile = nullptr;
   if (window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
-      window->type() == ui::wm::WINDOW_TYPE_POPUP) {
+      window->type() == ui::wm::WINDOW_TYPE_POPUP ||
+      window->type() == ui::wm::WINDOW_TYPE_CONTROL) {
     profile = reinterpret_cast<Profile*>(
         window->GetNativeWindowProperty(Profile::kProfileKey));
   }
 
   if (profile && !profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme))
     return ui::NativeThemeAura::instance();
 
-  return NULL;
+  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)
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kViewerConnect) ||
@@ skipping 44 matching lines @@
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
   if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH)
     views::LinuxUI::instance()->Initialize();
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
 #if !defined(OS_CHROMEOS)
 #if defined(USE_ASH)
-  if (!chrome::ShouldOpenAshOnStartup())
+  bool should_open_ash = chrome::ShouldOpenAshOnStartup();
+#else
+  bool should_open_ash = false;

[Evan Stade, 2015/10/29 22:59:43]

p.s. this change was just made to silence a presubmit error

[Elliot Glaysher, 2015/10/29 23:04:51]

Can't wait until ash is gone from chrome.

 #endif
-  {
+  if (!should_open_ash) {
     gfx::Screen* screen = views::CreateDesktopScreen();
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
 #if defined(USE_X11)
     views::LinuxUI::instance()->UpdateDeviceScaleFactor(
         screen->GetPrimaryDisplay().device_scale_factor());
 #endif
   }
 #endif
 }
 
@@ skipping 33 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