OLD | NEW |
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 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 6 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
7 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h" | 7 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h" |
8 #include "ui/aura/desktop.h" | 8 #include "ui/aura/root_window.h" |
9 #include "ui/aura_shell/shell.h" | 9 #include "ui/aura_shell/shell.h" |
10 | 10 |
11 #if defined(OS_CHROMEOS) | 11 #if defined(OS_CHROMEOS) |
12 #include "chrome/browser/chromeos/system/runtime_environment.h" | 12 #include "chrome/browser/chromeos/system/runtime_environment.h" |
13 #endif | 13 #endif |
14 | 14 |
15 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() | 15 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() |
16 : ChromeBrowserMainExtraParts() { | 16 : ChromeBrowserMainExtraParts() { |
17 } | 17 } |
18 | 18 |
19 void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() { | 19 void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() { |
20 #if defined(OS_CHROMEOS) | 20 #if defined(OS_CHROMEOS) |
21 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) | 21 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) |
22 aura::Desktop::set_use_fullscreen_host_window(true); | 22 aura::RootWindow::set_use_fullscreen_host_window(true); |
23 #endif | 23 #endif |
24 | 24 |
25 // Shell takes ownership of ChromeShellDelegate. | 25 // Shell takes ownership of ChromeShellDelegate. |
26 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); | 26 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); |
27 | 27 |
28 // Make sure the singleton ScreenOrientationListener object is created. | 28 // Make sure the singleton ScreenOrientationListener object is created. |
29 ScreenOrientationListener::GetInstance(); | 29 ScreenOrientationListener::GetInstance(); |
30 } | 30 } |
31 | 31 |
32 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { | 32 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() { |
33 aura_shell::Shell::DeleteInstance(); | 33 aura_shell::Shell::DeleteInstance(); |
34 aura::Desktop::DeleteInstance(); | 34 aura::RootWindow::DeleteInstance(); |
35 } | 35 } |
OLD | NEW |