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

Side by Side Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager (Closed)
Patch Set: WIP, add DBusThreadManagerAsh and DBusThreadManagerChrome 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell_browser_main_parts.h" 5 #include "content/shell/browser/shell_browser_main_parts.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 void ShellBrowserMainParts::PostMainMessageLoopStart() { 127 void ShellBrowserMainParts::PostMainMessageLoopStart() {
128 #if defined(OS_ANDROID) 128 #if defined(OS_ANDROID)
129 base::MessageLoopForUI::current()->Start(); 129 base::MessageLoopForUI::current()->Start();
130 #endif 130 #endif
131 131
132 #if defined(OS_CHROMEOS) 132 #if defined(OS_CHROMEOS)
133 chromeos::DBusThreadManager::Initialize(); 133 chromeos::DBusThreadManager::Initialize();
134 bluez::BluezDBusManager::Initialize( 134 bluez::BluezDBusManager::Initialize(
135 chromeos::DBusThreadManager::Get()->GetSystemBus(), 135 chromeos::DBusThreadManager::Get()->GetSystemBus(),
136 chromeos::DBusThreadManager::Get()->IsUsingStub( 136 chromeos::DBusThreadManager::Get()->IsUsingFake(
137 chromeos::DBusClientBundle::BLUETOOTH)); 137 chromeos::DBusClientBundle::BLUETOOTH));
138 #elif defined(OS_LINUX) 138 #elif defined(OS_LINUX)
139 bluez::DBusBluezManagerWrapperLinux::Initialize(); 139 bluez::DBusBluezManagerWrapperLinux::Initialize();
140 #endif 140 #endif
141 } 141 }
142 142
143 void ShellBrowserMainParts::PreEarlyInitialization() { 143 void ShellBrowserMainParts::PreEarlyInitialization() {
144 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 144 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
145 ui::InitializeInputMethodForTesting(); 145 ui::InitializeInputMethodForTesting();
146 #endif 146 #endif
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 device::BluetoothAdapterFactory::Shutdown(); 210 device::BluetoothAdapterFactory::Shutdown();
211 bluez::BluezDBusManager::Shutdown(); 211 bluez::BluezDBusManager::Shutdown();
212 chromeos::DBusThreadManager::Shutdown(); 212 chromeos::DBusThreadManager::Shutdown();
213 #elif defined(OS_LINUX) 213 #elif defined(OS_LINUX)
214 device::BluetoothAdapterFactory::Shutdown(); 214 device::BluetoothAdapterFactory::Shutdown();
215 bluez::DBusBluezManagerWrapperLinux::Shutdown(); 215 bluez::DBusBluezManagerWrapperLinux::Shutdown();
216 #endif 216 #endif
217 } 217 }
218 218
219 } // namespace 219 } // namespace
OLDNEW
« no previous file with comments | « content/browser/tracing/tracing_controller_impl.cc ('k') | extensions/browser/api/diagnostics/diagnostics_api_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698