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/common/login_status.h" | 7 #include "ash/common/login_status.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
9 #include "ash/content/shell_content_state.h" | 9 #include "ash/content/shell_content_state.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 ShellBrowserMainParts::~ShellBrowserMainParts() {} | 89 ShellBrowserMainParts::~ShellBrowserMainParts() {} |
90 | 90 |
91 void ShellBrowserMainParts::PreMainMessageLoopStart() { | 91 void ShellBrowserMainParts::PreMainMessageLoopStart() { |
92 #if defined(USE_X11) | 92 #if defined(USE_X11) |
93 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); | 93 ui::TouchFactory::SetTouchDeviceListFromCommandLine(); |
94 #endif | 94 #endif |
95 } | 95 } |
96 | 96 |
97 void ShellBrowserMainParts::PostMainMessageLoopStart() { | 97 void ShellBrowserMainParts::PostMainMessageLoopStart() { |
98 #if defined(OS_CHROMEOS) | 98 #if defined(OS_CHROMEOS) |
99 chromeos::DBusThreadManager::Initialize(); | 99 chromeos::DBusThreadManager::Initialize( |
| 100 chromeos::DBusThreadManager::PROCESS_ASH); |
100 #endif | 101 #endif |
101 } | 102 } |
102 | 103 |
103 void ShellBrowserMainParts::ToolkitInitialized() { | 104 void ShellBrowserMainParts::ToolkitInitialized() { |
104 ash::MaterialDesignController::Initialize(); | 105 ash::MaterialDesignController::Initialize(); |
105 wm_state_.reset(new ::wm::WMState); | 106 wm_state_.reset(new ::wm::WMState); |
106 } | 107 } |
107 | 108 |
108 void ShellBrowserMainParts::PreMainMessageLoopRun() { | 109 void ShellBrowserMainParts::PreMainMessageLoopRun() { |
109 net_log_.reset(new content::ShellNetLog("ash_shell")); | 110 net_log_.reset(new content::ShellNetLog("ash_shell")); |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 browser_context_.reset(); | 171 browser_context_.reset(); |
171 } | 172 } |
172 | 173 |
173 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { | 174 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) { |
174 base::RunLoop().Run(); | 175 base::RunLoop().Run(); |
175 return true; | 176 return true; |
176 } | 177 } |
177 | 178 |
178 } // namespace shell | 179 } // namespace shell |
179 } // namespace ash | 180 } // namespace ash |
OLD | NEW |