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

Side by Side Diff: extensions/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 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 void ShellBrowserMainParts::PostMainMessageLoopStart() { 100 void ShellBrowserMainParts::PostMainMessageLoopStart() {
101 #if defined(OS_CHROMEOS) 101 #if defined(OS_CHROMEOS)
102 // Perform initialization of D-Bus objects here rather than in the below 102 // Perform initialization of D-Bus objects here rather than in the below
103 // helper classes so those classes' tests can initialize stub versions of the 103 // helper classes so those classes' tests can initialize stub versions of the
104 // D-Bus objects. 104 // D-Bus objects.
105 chromeos::DBusThreadManager::Initialize(); 105 chromeos::DBusThreadManager::Initialize();
106 chromeos::disks::DiskMountManager::Initialize(); 106 chromeos::disks::DiskMountManager::Initialize();
107 107
108 bluez::BluezDBusManager::Initialize( 108 bluez::BluezDBusManager::Initialize(
109 chromeos::DBusThreadManager::Get()->GetSystemBus(), 109 chromeos::DBusThreadManager::Get()->GetSystemBus(),
110 chromeos::DBusThreadManager::Get()->IsUsingStub( 110 chromeos::DBusThreadManager::Get()->IsUsingFake(
111 chromeos::DBusClientBundle::BLUETOOTH)); 111 chromeos::DBusClientBundle::BLUETOOTH));
112 112
113 chromeos::NetworkHandler::Initialize(); 113 chromeos::NetworkHandler::Initialize();
114 network_controller_.reset(new ShellNetworkController( 114 network_controller_.reset(new ShellNetworkController(
115 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative( 115 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
116 switches::kAppShellPreferredNetwork))); 116 switches::kAppShellPreferredNetwork)));
117 117
118 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 118 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
119 switches::kAppShellAllowRoaming)) { 119 switches::kAppShellAllowRoaming)) {
120 network_controller_->SetCellularAllowRoaming(true); 120 network_controller_->SetCellularAllowRoaming(true);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 } 289 }
290 290
291 void ShellBrowserMainParts::CreateExtensionSystem() { 291 void ShellBrowserMainParts::CreateExtensionSystem() {
292 DCHECK(browser_context_); 292 DCHECK(browser_context_);
293 extension_system_ = static_cast<ShellExtensionSystem*>( 293 extension_system_ = static_cast<ShellExtensionSystem*>(
294 ExtensionSystem::Get(browser_context_.get())); 294 ExtensionSystem::Get(browser_context_.get()));
295 extension_system_->InitForRegularProfile(true); 295 extension_system_->InitForRegularProfile(true);
296 } 296 }
297 297
298 } // namespace extensions 298 } // namespace extensions
OLDNEW
« chromeos/dbus/dbus_thread_manager.cc ('K') | « 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