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

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: cleanup 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 void ShellBrowserMainParts::PostMainMessageLoopStart() { 129 void ShellBrowserMainParts::PostMainMessageLoopStart() {
130 #if defined(OS_ANDROID) 130 #if defined(OS_ANDROID)
131 base::MessageLoopForUI::current()->Start(); 131 base::MessageLoopForUI::current()->Start();
132 #endif 132 #endif
133 133
134 #if defined(OS_CHROMEOS) 134 #if defined(OS_CHROMEOS)
135 chromeos::DBusThreadManager::Initialize(); 135 chromeos::DBusThreadManager::Initialize();
136 bluez::BluezDBusManager::Initialize( 136 bluez::BluezDBusManager::Initialize(
137 chromeos::DBusThreadManager::Get()->GetSystemBus(), 137 chromeos::DBusThreadManager::Get()->GetSystemBus(),
138 chromeos::DBusThreadManager::Get()->IsUsingStub( 138 chromeos::DBusThreadManager::Get()->IsUsingFake(
139 chromeos::DBusClientBundle::BLUETOOTH)); 139 chromeos::DBusClientBundle::BLUETOOTH));
140 #elif defined(OS_LINUX) 140 #elif defined(OS_LINUX)
141 bluez::DBusBluezManagerWrapperLinux::Initialize(); 141 bluez::DBusBluezManagerWrapperLinux::Initialize();
142 #endif 142 #endif
143 } 143 }
144 144
145 void ShellBrowserMainParts::PreEarlyInitialization() { 145 void ShellBrowserMainParts::PreEarlyInitialization() {
146 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 146 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
147 ui::InitializeInputMethodForTesting(); 147 ui::InitializeInputMethodForTesting();
148 #endif 148 #endif
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 device::BluetoothAdapterFactory::Shutdown(); 215 device::BluetoothAdapterFactory::Shutdown();
216 bluez::BluezDBusManager::Shutdown(); 216 bluez::BluezDBusManager::Shutdown();
217 chromeos::DBusThreadManager::Shutdown(); 217 chromeos::DBusThreadManager::Shutdown();
218 #elif defined(OS_LINUX) 218 #elif defined(OS_LINUX)
219 device::BluetoothAdapterFactory::Shutdown(); 219 device::BluetoothAdapterFactory::Shutdown();
220 bluez::DBusBluezManagerWrapperLinux::Shutdown(); 220 bluez::DBusBluezManagerWrapperLinux::Shutdown();
221 #endif 221 #endif
222 } 222 }
223 223
224 } // namespace 224 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698