| 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_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) |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 void ChromeBrowserPartsAura::ToolkitInitialized() { | 24 void ChromeBrowserPartsAura::ToolkitInitialized() { |
| 25 } | 25 } |
| 26 | 26 |
| 27 void ChromeBrowserPartsAura::PreMainMessageLoopStart() { | 27 void ChromeBrowserPartsAura::PreMainMessageLoopStart() { |
| 28 } | 28 } |
| 29 | 29 |
| 30 void ChromeBrowserPartsAura::PostMainMessageLoopStart() { | 30 void ChromeBrowserPartsAura::PostMainMessageLoopStart() { |
| 31 } | 31 } |
| 32 | 32 |
| 33 void ChromeBrowserPartsAura::PreMainMessageLoopRun() { | 33 content::IOThreadDelegate* ChromeBrowserPartsAura::PreMainMessageLoopRun() { |
| 34 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
| 35 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) | 35 if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) |
| 36 aura::Desktop::set_use_fullscreen_host_window(true); | 36 aura::Desktop::set_use_fullscreen_host_window(true); |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 // Shell takes ownership of ChromeShellDelegate. | 39 // Shell takes ownership of ChromeShellDelegate. |
| 40 aura_shell::Shell::GetInstance()->SetDelegate(new ChromeShellDelegate); | 40 aura_shell::Shell::GetInstance()->SetDelegate(new ChromeShellDelegate); |
| 41 return NULL; |
| 41 } | 42 } |
| 42 | 43 |
| 43 bool ChromeBrowserPartsAura::MainMessageLoopRun(int* result_code) { | 44 bool ChromeBrowserPartsAura::MainMessageLoopRun(int* result_code) { |
| 44 return false; | 45 return false; |
| 45 } | 46 } |
| 46 | 47 |
| 47 void ChromeBrowserPartsAura::PostMainMessageLoopRun() { | 48 void ChromeBrowserPartsAura::PostMainMessageLoopRun() { |
| 48 } | 49 } |
| OLD | NEW |