Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2343993003: chromeos: Refactor D-Bus client creation for ash and browser processes (Closed)
Patch Set: rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698