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

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: WIP, add DBusThreadManagerAsh and DBusThreadManagerChrome 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 | « extensions/browser/api/diagnostics/diagnostics_api_chromeos.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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 void ShellBrowserMainParts::PostMainMessageLoopStart() { 98 void ShellBrowserMainParts::PostMainMessageLoopStart() {
99 #if defined(OS_CHROMEOS) 99 #if defined(OS_CHROMEOS)
100 // 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
101 // 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
102 // D-Bus objects. 102 // D-Bus objects.
103 chromeos::DBusThreadManager::Initialize(); 103 chromeos::DBusThreadManager::Initialize();
104 chromeos::disks::DiskMountManager::Initialize(); 104 chromeos::disks::DiskMountManager::Initialize();
105 105
106 bluez::BluezDBusManager::Initialize( 106 bluez::BluezDBusManager::Initialize(
107 chromeos::DBusThreadManager::Get()->GetSystemBus(), 107 chromeos::DBusThreadManager::Get()->GetSystemBus(),
108 chromeos::DBusThreadManager::Get()->IsUsingStub( 108 chromeos::DBusThreadManager::Get()->IsUsingFake(
109 chromeos::DBusClientBundle::BLUETOOTH)); 109 chromeos::DBusClientBundle::BLUETOOTH));
110 110
111 chromeos::NetworkHandler::Initialize(); 111 chromeos::NetworkHandler::Initialize();
112 network_controller_.reset(new ShellNetworkController( 112 network_controller_.reset(new ShellNetworkController(
113 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative( 113 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
114 switches::kAppShellPreferredNetwork))); 114 switches::kAppShellPreferredNetwork)));
115 115
116 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 116 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
117 switches::kAppShellAllowRoaming)) { 117 switches::kAppShellAllowRoaming)) {
118 network_controller_->SetCellularAllowRoaming(true); 118 network_controller_->SetCellularAllowRoaming(true);
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 } 286 }
287 287
288 void ShellBrowserMainParts::CreateExtensionSystem() { 288 void ShellBrowserMainParts::CreateExtensionSystem() {
289 DCHECK(browser_context_); 289 DCHECK(browser_context_);
290 extension_system_ = static_cast<ShellExtensionSystem*>( 290 extension_system_ = static_cast<ShellExtensionSystem*>(
291 ExtensionSystem::Get(browser_context_.get())); 291 ExtensionSystem::Get(browser_context_.get()));
292 extension_system_->InitForRegularProfile(true); 292 extension_system_->InitForRegularProfile(true);
293 } 293 }
294 294
295 } // namespace extensions 295 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/diagnostics/diagnostics_api_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698