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

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

Issue 2350543002: chromeos; Remove unused switch --dbus-unstub-clients / --dbus-real-clients (Closed)
Patch Set: rebase again 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 30 matching lines...) Expand all
41 #include "net/base/network_change_notifier.h" 41 #include "net/base/network_change_notifier.h"
42 #endif 42 #endif
43 43
44 #if defined(USE_AURA) && defined(USE_X11) 44 #if defined(USE_AURA) && defined(USE_X11)
45 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck 45 #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck
46 #endif 46 #endif
47 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 47 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
48 #include "ui/base/ime/input_method_initializer.h" 48 #include "ui/base/ime/input_method_initializer.h"
49 #endif 49 #endif
50 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 #include "chromeos/dbus/dbus_client_types.h"
52 #include "chromeos/dbus/dbus_thread_manager.h" 51 #include "chromeos/dbus/dbus_thread_manager.h"
53 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 52 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
54 #elif defined(OS_LINUX) 53 #elif defined(OS_LINUX)
55 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h" 54 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
56 #endif 55 #endif
57 56
58 namespace content { 57 namespace content {
59 58
60 namespace { 59 namespace {
61 60
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 126
128 void ShellBrowserMainParts::PostMainMessageLoopStart() { 127 void ShellBrowserMainParts::PostMainMessageLoopStart() {
129 #if defined(OS_ANDROID) 128 #if defined(OS_ANDROID)
130 base::MessageLoopForUI::current()->Start(); 129 base::MessageLoopForUI::current()->Start();
131 #endif 130 #endif
132 131
133 #if defined(OS_CHROMEOS) 132 #if defined(OS_CHROMEOS)
134 chromeos::DBusThreadManager::Initialize(); 133 chromeos::DBusThreadManager::Initialize();
135 bluez::BluezDBusManager::Initialize( 134 bluez::BluezDBusManager::Initialize(
136 chromeos::DBusThreadManager::Get()->GetSystemBus(), 135 chromeos::DBusThreadManager::Get()->GetSystemBus(),
137 chromeos::DBusThreadManager::Get()->IsUsingFake( 136 chromeos::DBusThreadManager::Get()->IsUsingFakes());
138 chromeos::DBusClientType::BLUETOOTH));
139 #elif defined(OS_LINUX) 137 #elif defined(OS_LINUX)
140 bluez::DBusBluezManagerWrapperLinux::Initialize(); 138 bluez::DBusBluezManagerWrapperLinux::Initialize();
141 #endif 139 #endif
142 } 140 }
143 141
144 void ShellBrowserMainParts::PreEarlyInitialization() { 142 void ShellBrowserMainParts::PreEarlyInitialization() {
145 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) 143 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
146 ui::InitializeInputMethodForTesting(); 144 ui::InitializeInputMethodForTesting();
147 #endif 145 #endif
148 #if defined(OS_ANDROID) 146 #if defined(OS_ANDROID)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 device::BluetoothAdapterFactory::Shutdown(); 209 device::BluetoothAdapterFactory::Shutdown();
212 bluez::BluezDBusManager::Shutdown(); 210 bluez::BluezDBusManager::Shutdown();
213 chromeos::DBusThreadManager::Shutdown(); 211 chromeos::DBusThreadManager::Shutdown();
214 #elif defined(OS_LINUX) 212 #elif defined(OS_LINUX)
215 device::BluetoothAdapterFactory::Shutdown(); 213 device::BluetoothAdapterFactory::Shutdown();
216 bluez::DBusBluezManagerWrapperLinux::Shutdown(); 214 bluez::DBusBluezManagerWrapperLinux::Shutdown();
217 #endif 215 #endif
218 } 216 }
219 217
220 } // namespace 218 } // namespace
OLDNEW
« no previous file with comments | « chromeos/dbus/update_engine_client.h ('k') | extensions/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698