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

Side by Side Diff: extensions/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
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/shell/browser/shell_browser_main_parts.h" 5 #include "extensions/shell/browser/shell_browser_main_parts.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 29 matching lines...) Expand all
40 #include "ui/base/ime/input_method_initializer.h" 40 #include "ui/base/ime/input_method_initializer.h"
41 #include "ui/base/resource/resource_bundle.h" 41 #include "ui/base/resource/resource_bundle.h"
42 42
43 #if defined(USE_AURA) 43 #if defined(USE_AURA)
44 #include "ui/aura/env.h" 44 #include "ui/aura/env.h"
45 #endif 45 #endif
46 46
47 #if defined(OS_CHROMEOS) 47 #if defined(OS_CHROMEOS)
48 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 48 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
49 #include "chromeos/audio/cras_audio_handler.h" 49 #include "chromeos/audio/cras_audio_handler.h"
50 #include "chromeos/dbus/dbus_client_types.h"
51 #include "chromeos/dbus/dbus_thread_manager.h" 50 #include "chromeos/dbus/dbus_thread_manager.h"
52 #include "chromeos/disks/disk_mount_manager.h" 51 #include "chromeos/disks/disk_mount_manager.h"
53 #include "chromeos/network/network_handler.h" 52 #include "chromeos/network/network_handler.h"
54 #include "device/bluetooth/bluetooth_adapter_factory.h" 53 #include "device/bluetooth/bluetooth_adapter_factory.h"
55 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 54 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
56 #include "extensions/shell/browser/shell_audio_controller_chromeos.h" 55 #include "extensions/shell/browser/shell_audio_controller_chromeos.h"
57 #include "extensions/shell/browser/shell_network_controller_chromeos.h" 56 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
58 #endif 57 #endif
59 58
60 #if defined(OS_MACOSX) 59 #if defined(OS_MACOSX)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void ShellBrowserMainParts::PostMainMessageLoopStart() { 98 void ShellBrowserMainParts::PostMainMessageLoopStart() {
100 #if defined(OS_CHROMEOS) 99 #if defined(OS_CHROMEOS)
101 // Perform initialization of D-Bus objects here rather than in the below 100 // Perform initialization of D-Bus objects here rather than in the below
102 // helper classes so those classes' tests can initialize stub versions of the 101 // helper classes so those classes' tests can initialize stub versions of the
103 // D-Bus objects. 102 // D-Bus objects.
104 chromeos::DBusThreadManager::Initialize(); 103 chromeos::DBusThreadManager::Initialize();
105 chromeos::disks::DiskMountManager::Initialize(); 104 chromeos::disks::DiskMountManager::Initialize();
106 105
107 bluez::BluezDBusManager::Initialize( 106 bluez::BluezDBusManager::Initialize(
108 chromeos::DBusThreadManager::Get()->GetSystemBus(), 107 chromeos::DBusThreadManager::Get()->GetSystemBus(),
109 chromeos::DBusThreadManager::Get()->IsUsingFake( 108 chromeos::DBusThreadManager::Get()->IsUsingFakes());
110 chromeos::DBusClientType::BLUETOOTH));
111 109
112 chromeos::NetworkHandler::Initialize(); 110 chromeos::NetworkHandler::Initialize();
113 network_controller_.reset(new ShellNetworkController( 111 network_controller_.reset(new ShellNetworkController(
114 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative( 112 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
115 switches::kAppShellPreferredNetwork))); 113 switches::kAppShellPreferredNetwork)));
116 114
117 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 115 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
118 switches::kAppShellAllowRoaming)) { 116 switches::kAppShellAllowRoaming)) {
119 network_controller_->SetCellularAllowRoaming(true); 117 network_controller_->SetCellularAllowRoaming(true);
120 } 118 }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 } 285 }
288 286
289 void ShellBrowserMainParts::CreateExtensionSystem() { 287 void ShellBrowserMainParts::CreateExtensionSystem() {
290 DCHECK(browser_context_); 288 DCHECK(browser_context_);
291 extension_system_ = static_cast<ShellExtensionSystem*>( 289 extension_system_ = static_cast<ShellExtensionSystem*>(
292 ExtensionSystem::Get(browser_context_.get())); 290 ExtensionSystem::Get(browser_context_.get()));
293 extension_system_->InitForRegularProfile(true); 291 extension_system_->InitForRegularProfile(true);
294 } 292 }
295 293
296 } // namespace extensions 294 } // namespace extensions
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_main_parts.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698