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

chrome/browser/extensions/extension_tabs_module.cc

Index: chrome/browser/extensions/extension_tabs_module.cc
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index dbf198bc71c1fd73545ff35ba40c7c0bf1c79986..7548cec6bd70b83dd3892414a4c15dd75b143993 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -63,7 +63,7 @@
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
@@ -576,7 +576,7 @@ bool CreateWindowFunction::RunImpl() {
 #if !defined(OS_ANDROID)
         use_panels = PanelManager::ShouldUsePanels(extension_id);
 #endif
-#if defined(USE_AURA)
+#if defined(USE_ASH)
         if (CommandLine::ForCurrentProcess()->HasSwitch(
                 ash::switches::kAuraPanelManager))
           use_panels = true;
@@ -592,7 +592,7 @@ bool CreateWindowFunction::RunImpl() {
     }
   }
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   // Aura Panels create a new PanelViewAura.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAuraPanelManager) &&