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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index a229eca1c39ebbee064a3b4e2c98592b3c3a1a03..919e8d3aad02b9dd459bcf66a1e7ae0c6fb41f21 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -210,7 +210,7 @@
 #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"
@@ -719,7 +719,7 @@ WebContents* Browser::OpenApplication(
       break;
     }
     case extension_misc::LAUNCH_PANEL:
-#if defined(USE_AURA)
+#if defined(USE_ASH)
       if (extension &&
           CommandLine::ForCurrentProcess()->HasSwitch(
               ash::switches::kAuraPanelManager)) {
@@ -744,7 +744,7 @@ WebContents* Browser::OpenApplication(
   return tab;
 }
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 // static
 WebContents* Browser::OpenApplicationPanel(
     Profile* profile,
@@ -4588,7 +4588,7 @@ BrowserWindow* Browser::CreateBrowserWindow() {
   // 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();