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

chrome/browser/chrome_browser_main_extra_parts_ash.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/chrome_browser_main_extra_parts_aura.h"
+#include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/ui/views/ash/caps_lock_handler.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h"
 #include "chrome/browser/ui/views/ash/screenshot_taker.h"
 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
 #include "ui/aura/env.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
-ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
+ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh()
     : ChromeBrowserMainExtraParts() {
 }
 
-void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
+void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 #if defined(OS_CHROMEOS)
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS() ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAuraHostWindowUseFullscreen)) {
     aura::RootWindow::set_use_fullscreen_host_window(true);
     aura::RootWindow::set_hide_host_cursor(true);
     // Hide the mouse cursor completely at boot.
     if (!chromeos::UserManager::Get()->IsUserLoggedIn())
       ash::Shell::set_initially_hide_cursor(true);
   }
@@ skipping 14 matching lines @@
   shell->accelerator_controller()->SetImeControlDelegate(
       scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
   shell->accelerator_controller()->SetVolumeControlDelegate(
       scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass());
 #endif
 
   // Make sure the singleton ScreenOrientationListener object is created.
   ScreenOrientationListener::GetInstance();
 }
 
-void ChromeBrowserMainExtraPartsAura::PostProfileInit() {
+void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
   // Add the status area buttons after Profile has been initialized.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
         ash::switches::kAshUberTray)) {
     ChromeShellDelegate::instance()->status_area_host()->AddButtons();
   }
 }
 
-void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
+void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
   ash::Shell::DeleteInstance();
-  aura::Env::DeleteInstance();
 }