| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/shell/content/client/shell_browser_main_parts.h" | 5 #include "ash/shell/content/client/shell_browser_main_parts.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/content/shell_content_state.h" | 8 #include "ash/content/shell_content_state.h" |
| 9 #include "ash/desktop_background/desktop_background_controller.h" | 9 #include "ash/desktop_background/desktop_background_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 #endif | 93 #endif |
| 94 } | 94 } |
| 95 | 95 |
| 96 void ShellBrowserMainParts::PostMainMessageLoopStart() { | 96 void ShellBrowserMainParts::PostMainMessageLoopStart() { |
| 97 #if defined(OS_CHROMEOS) | 97 #if defined(OS_CHROMEOS) |
| 98 chromeos::DBusThreadManager::Initialize(); | 98 chromeos::DBusThreadManager::Initialize(); |
| 99 #endif | 99 #endif |
| 100 } | 100 } |
| 101 | 101 |
| 102 void ShellBrowserMainParts::ToolkitInitialized() { | 102 void ShellBrowserMainParts::ToolkitInitialized() { |
| 103 wm_state_.reset(new wm::WMState); | 103 wm_state_.reset(new ::wm::WMState); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void ShellBrowserMainParts::PreMainMessageLoopRun() { | 106 void ShellBrowserMainParts::PreMainMessageLoopRun() { |
| 107 net_log_.reset(new content::ShellNetLog("ash_shell")); | 107 net_log_.reset(new content::ShellNetLog("ash_shell")); |
| 108 browser_context_.reset( | 108 browser_context_.reset( |
| 109 new content::ShellBrowserContext(false, net_log_.get())); | 109 new content::ShellBrowserContext(false, net_log_.get())); |
| 110 | 110 |
| 111 // A ViewsDelegate is required. | 111 // A ViewsDelegate is required. |
| 112 if (!views::ViewsDelegate::GetInstance()) | 112 if (!views::ViewsDelegate::GetInstance()) |
| 113 views_delegate_.reset(new ShellViewsDelegate); | 113 views_delegate_.reset(new ShellViewsDelegate); |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 browser_context_.reset(); | 168 browser_context_.reset(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 171 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
| 172 base::MessageLoop::current()->Run(); | 172 base::MessageLoop::current()->Run(); |
| 173 return true; | 173 return true; |
| 174 } | 174 } |
| 175 | 175 |
| 176 } // namespace shell | 176 } // namespace shell |
| 177 } // namespace ash | 177 } // namespace ash |
| OLD | NEW |