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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.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
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "chrome/common/pref_names.h" 93 #include "chrome/common/pref_names.h"
94 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 94 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
95 #include "chromeos/audio/cras_audio_handler.h" 95 #include "chromeos/audio/cras_audio_handler.h"
96 #include "chromeos/cert_loader.h" 96 #include "chromeos/cert_loader.h"
97 #include "chromeos/chromeos_paths.h" 97 #include "chromeos/chromeos_paths.h"
98 #include "chromeos/chromeos_switches.h" 98 #include "chromeos/chromeos_switches.h"
99 #include "chromeos/cryptohome/async_method_caller.h" 99 #include "chromeos/cryptohome/async_method_caller.h"
100 #include "chromeos/cryptohome/cryptohome_parameters.h" 100 #include "chromeos/cryptohome/cryptohome_parameters.h"
101 #include "chromeos/cryptohome/homedir_methods.h" 101 #include "chromeos/cryptohome/homedir_methods.h"
102 #include "chromeos/cryptohome/system_salt_getter.h" 102 #include "chromeos/cryptohome/system_salt_getter.h"
103 #include "chromeos/dbus/dbus_client_types.h"
104 #include "chromeos/dbus/dbus_thread_manager.h" 103 #include "chromeos/dbus/dbus_thread_manager.h"
105 #include "chromeos/dbus/power_policy_controller.h" 104 #include "chromeos/dbus/power_policy_controller.h"
106 #include "chromeos/dbus/services/console_service_provider.h" 105 #include "chromeos/dbus/services/console_service_provider.h"
107 #include "chromeos/dbus/services/cros_dbus_service.h" 106 #include "chromeos/dbus/services/cros_dbus_service.h"
108 #include "chromeos/dbus/services/display_power_service_provider.h" 107 #include "chromeos/dbus/services/display_power_service_provider.h"
109 #include "chromeos/dbus/services/liveness_service_provider.h" 108 #include "chromeos/dbus/services/liveness_service_provider.h"
110 #include "chromeos/dbus/services/proxy_resolution_service_provider.h" 109 #include "chromeos/dbus/services/proxy_resolution_service_provider.h"
111 #include "chromeos/dbus/session_manager_client.h" 110 #include "chromeos/dbus/session_manager_client.h"
112 #include "chromeos/disks/disk_mount_manager.h" 111 #include "chromeos/disks/disk_mount_manager.h"
113 #include "chromeos/login/login_state.h" 112 #include "chromeos/login/login_state.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 DBusThreadManager::ProcessMask process_mask = 201 DBusThreadManager::ProcessMask process_mask =
203 chrome::IsRunningInMash() ? DBusThreadManager::PROCESS_BROWSER 202 chrome::IsRunningInMash() ? DBusThreadManager::PROCESS_BROWSER
204 : DBusThreadManager::PROCESS_ALL; 203 : DBusThreadManager::PROCESS_ALL;
205 204
206 // Initialize DBusThreadManager for the browser. This must be done after 205 // Initialize DBusThreadManager for the browser. This must be done after
207 // the main message loop is started, as it uses the message loop. 206 // the main message loop is started, as it uses the message loop.
208 DBusThreadManager::Initialize(process_mask); 207 DBusThreadManager::Initialize(process_mask);
209 208
210 bluez::BluezDBusManager::Initialize( 209 bluez::BluezDBusManager::Initialize(
211 DBusThreadManager::Get()->GetSystemBus(), 210 DBusThreadManager::Get()->GetSystemBus(),
212 chromeos::DBusThreadManager::Get()->IsUsingFake( 211 chromeos::DBusThreadManager::Get()->IsUsingFakes());
213 chromeos::DBusClientType::BLUETOOTH));
214 212
215 PowerPolicyController::Initialize( 213 PowerPolicyController::Initialize(
216 DBusThreadManager::Get()->GetPowerManagerClient()); 214 DBusThreadManager::Get()->GetPowerManagerClient());
217 215
218 CrosDBusService::ServiceProviderList service_providers; 216 CrosDBusService::ServiceProviderList service_providers;
219 service_providers.push_back( 217 service_providers.push_back(
220 base::WrapUnique(ProxyResolutionServiceProvider::Create( 218 base::WrapUnique(ProxyResolutionServiceProvider::Create(
221 base::MakeUnique<ChromeProxyResolverDelegate>()))); 219 base::MakeUnique<ChromeProxyResolverDelegate>())));
222 if (!chrome::IsRunningInMash()) { 220 if (!chrome::IsRunningInMash()) {
223 // TODO(crbug.com/629707): revisit this with mustash dbus work. 221 // TODO(crbug.com/629707): revisit this with mustash dbus work.
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 // Destroy DBus services immediately after threads are stopped. 883 // Destroy DBus services immediately after threads are stopped.
886 dbus_services_.reset(); 884 dbus_services_.reset();
887 885
888 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 886 ChromeBrowserMainPartsLinux::PostDestroyThreads();
889 887
890 // Destroy DeviceSettingsService after g_browser_process. 888 // Destroy DeviceSettingsService after g_browser_process.
891 DeviceSettingsService::Shutdown(); 889 DeviceSettingsService::Shutdown();
892 } 890 }
893 891
894 } // namespace chromeos 892 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698