| 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_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 "ui/aura/desktop.h" | 7 #include "ui/aura/desktop.h" |
| 8 #include "ui/aura_shell/shell.h" | 8 #include "ui/aura_shell/shell.h" |
| 9 | 9 |
| 10 #if defined(OS_CHROMEOS) | 10 #if defined(OS_CHROMEOS) |
| 11 #include "chrome/browser/chromeos/system/runtime_environment.h" | 11 #include "chrome/browser/chromeos/system/runtime_environment.h" |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() | 14 ChromeBrowserPartsAura::ChromeBrowserPartsAura() |
| 15 : ChromeBrowserMainExtraParts() { | 15 : content::BrowserMainParts() { |
| 16 } | 16 } |
| 17 | 17 |
| 18 void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() { | 18 void ChromeBrowserPartsAura::PreEarlyInitialization() { |
| 19 } |
| 20 |
| 21 void ChromeBrowserPartsAura::PostEarlyInitialization() { |
| 22 } |
| 23 |
| 24 void ChromeBrowserPartsAura::ToolkitInitialized() { |
| 25 } |
| 26 |
| 27 void ChromeBrowserPartsAura::PreMainMessageLoopStart() { |
| 28 } |
| 29 |
| 30 void ChromeBrowserPartsAura::PostMainMessageLoopStart() { |
| 31 } |
| 32 |
| 33 void ChromeBrowserPartsAura::PreMainMessageLoopRun() { |
| 19 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
| 20 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) | 35 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) |
| 21 aura::Desktop::set_use_fullscreen_host_window(true); | 36 aura::Desktop::set_use_fullscreen_host_window(true); |
| 22 #endif | 37 #endif |
| 23 | 38 |
| 24 // Shell takes ownership of ChromeShellDelegate. | 39 // Shell takes ownership of ChromeShellDelegate. |
| 25 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); | 40 aura_shell::Shell::CreateInstance(new ChromeShellDelegate); |
| 26 } | 41 } |
| 42 |
| 43 bool ChromeBrowserPartsAura::MainMessageLoopRun(int* result_code) { |
| 44 return false; |
| 45 } |
| 46 |
| 47 void ChromeBrowserPartsAura::PostMainMessageLoopRun() { |
| 48 } |
| OLD | NEW |