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

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

Issue 1186293003: Implement HasInputDevices in CrasAudioManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SetHasInputDevice in FakeAudioManager Created 5 years, 5 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/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 browser_context_.reset(new ShellBrowserContext); 145 browser_context_.reset(new ShellBrowserContext);
146 146
147 // app_shell only supports a single user, so all preferences live in the user 147 // app_shell only supports a single user, so all preferences live in the user
148 // data directory, including the device-wide local state. 148 // data directory, including the device-wide local state.
149 local_state_ = shell_prefs::CreateLocalState(browser_context_->GetPath()); 149 local_state_ = shell_prefs::CreateLocalState(browser_context_->GetPath());
150 user_pref_service_ = 150 user_pref_service_ =
151 shell_prefs::CreateUserPrefService(browser_context_.get()); 151 shell_prefs::CreateUserPrefService(browser_context_.get());
152 152
153 #if defined(OS_CHROMEOS) 153 #if defined(OS_CHROMEOS)
154 chromeos::CrasAudioHandler::Initialize( 154 chromeos::CrasAudioHandler::Initialize(
155 new chromeos::AudioDevicesPrefHandlerImpl(local_state_.get())); 155 new chromeos::AudioDevicesPrefHandlerImpl(local_state_.get()),
156 make_scoped_ptr(
157 new chromeos::CrasAudioHandler::AudioManagerWrapperImpl()));
156 audio_controller_.reset(new ShellAudioController()); 158 audio_controller_.reset(new ShellAudioController());
157 #endif 159 #endif
158 160
159 #if defined(USE_AURA) 161 #if defined(USE_AURA)
160 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory()); 162 aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
161 #endif 163 #endif
162 164
163 storage_monitor::StorageMonitor::Create(); 165 storage_monitor::StorageMonitor::Create();
164 166
165 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController()); 167 desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 } 301 }
300 302
301 void ShellBrowserMainParts::CreateExtensionSystem() { 303 void ShellBrowserMainParts::CreateExtensionSystem() {
302 DCHECK(browser_context_); 304 DCHECK(browser_context_);
303 extension_system_ = static_cast<ShellExtensionSystem*>( 305 extension_system_ = static_cast<ShellExtensionSystem*>(
304 ExtensionSystem::Get(browser_context_.get())); 306 ExtensionSystem::Get(browser_context_.get()));
305 extension_system_->InitForRegularProfile(true); 307 extension_system_->InitForRegularProfile(true);
306 } 308 }
307 309
308 } // namespace extensions 310 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698