Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: chrome/browser/chrome_browser_main_extra_parts_aura.cc

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" 5 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 24 matching lines...) Expand all
35 ui::gfx_test_utils::SetupTestCompositor(); 35 ui::gfx_test_utils::SetupTestCompositor();
36 #endif 36 #endif
37 } 37 }
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) 40 if (chromeos::system::runtime_environment::IsRunningOnChromeOS())
41 aura::RootWindow::set_use_fullscreen_host_window(true); 41 aura::RootWindow::set_use_fullscreen_host_window(true);
42 #endif 42 #endif
43 43
44 // Shell takes ownership of ChromeShellDelegate. 44 // Shell takes ownership of ChromeShellDelegate.
45 aura_shell::Shell* aura_shell = 45 ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
46 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); 46 // AcceleratorController takes ownership of ScreenshotDelegate.
47 // accelerator controller takes ownership of ScreenshotDelegate. 47 shell->accelerator_controller()->SetScreenshotDelegate(new ScreenshotTaker);
48 aura_shell->accelerator_controller()->SetScreenshotDelegate(
49 new ScreenshotTaker);
50 48
51 // Make sure the singleton ScreenOrientationListener object is created. 49 // Make sure the singleton ScreenOrientationListener object is created.
52 ScreenOrientationListener::GetInstance(); 50 ScreenOrientationListener::GetInstance();
53 } 51 }
54 52
55 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { 53 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
56 aura_shell::Shell::DeleteInstance(); 54 ash::Shell::DeleteInstance();
57 aura::RootWindow::DeleteInstance(); 55 aura::RootWindow::DeleteInstance();
58 } 56 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698