Aura/ash split: Split the extra parts into ash and aura parts.

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 192 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #if defined(USE_AURA)
 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
 #endif
 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
 #endif
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
 #endif
 
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
 #include "chrome/browser/download/download_shelf.h"
 #endif
 
 #if defined(FILE_MANAGER_EXTENSION)
@@ skipping 488 matching lines @@
     case extension_misc::LAUNCH_SHELL: {
       ShellWindow* shell_window = ShellWindow::Create(
           profile,
           extension,
           UrlForExtension(extension, override_url));
       if (shell_window)
         tab = shell_window->web_contents();
       break;
     }
     case extension_misc::LAUNCH_PANEL:
-#if defined(USE_AURA)
+#if defined(USE_ASH)
       if (extension &&
           CommandLine::ForCurrentProcess()->HasSwitch(
               ash::switches::kAuraPanelManager)) {
         tab = OpenApplicationPanel(profile, extension, override_url);
         break;
       }
       // else fall through to LAUNCH_WINDOW
 #endif
     case extension_misc::LAUNCH_WINDOW:
       tab = Browser::OpenApplicationWindow(profile, extension, container,
                                            override_url, NULL);
       break;
     case extension_misc::LAUNCH_TAB: {
       tab = Browser::OpenApplicationTab(profile, extension, override_url,
                                         disposition);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
   return tab;
 }
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 // static
 WebContents* Browser::OpenApplicationPanel(
     Profile* profile,
     const Extension* extension,
     const GURL& url_input) {
   GURL url = UrlForExtension(extension, url_input);
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension->id());
   gfx::Rect panel_bounds;
   panel_bounds.set_width(extension->launch_width());
@@ skipping 3823 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, protected:
 
 BrowserWindow* Browser::CreateBrowserWindow() {
   // TODO(yfriedman): remove OS_ANDROID clause when browser is excluded from
   // Android build.
 #if !defined(OS_ANDROID)
   bool create_panel = false;
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAuraPanelManager))
     create_panel = is_type_panel();
 #elif !defined(OS_CHROMEOS)
   create_panel = is_type_panel();
 #endif
   if (create_panel)
     return PanelManager::GetInstance()->CreatePanel(this);
 #endif  // OS_ANDROID
 
@@ skipping 1020 matching lines @@
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI();
   }
 #endif
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }