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

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

Issue 2482463002: Remove DeviceMonitorLinux::WillDestroyCurrentMessageLoop(). (Closed)
Patch Set: CR achuithb #24 Created 4 years, 1 month 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 | « device/usb/usb_service_linux.cc ('k') | extensions/shell/browser/shell_device_client.h » ('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 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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 241
242 oauth2_token_service_.reset(); 242 oauth2_token_service_.reset();
243 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices( 243 BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
244 browser_context_.get()); 244 browser_context_.get());
245 extension_system_ = NULL; 245 extension_system_ = NULL;
246 ExtensionsBrowserClient::Set(NULL); 246 ExtensionsBrowserClient::Set(NULL);
247 extensions_browser_client_.reset(); 247 extensions_browser_client_.reset();
248 248
249 desktop_controller_.reset(); 249 desktop_controller_.reset();
250 250
251 // ShellDeviceClient must be shutdown when the FILE thread is still alive.
252 device_client_->Shutdown();
253
251 storage_monitor::StorageMonitor::Destroy(); 254 storage_monitor::StorageMonitor::Destroy();
252 255
253 #if defined(OS_CHROMEOS) 256 #if defined(OS_CHROMEOS)
254 audio_controller_.reset(); 257 audio_controller_.reset();
255 chromeos::CrasAudioHandler::Shutdown(); 258 chromeos::CrasAudioHandler::Shutdown();
256 #endif 259 #endif
257 260
258 user_pref_service_->CommitPendingWrite(); 261 user_pref_service_->CommitPendingWrite();
259 user_pref_service_.reset(); 262 user_pref_service_.reset();
260 local_state_->CommitPendingWrite(); 263 local_state_->CommitPendingWrite();
(...skipping 24 matching lines...) Expand all
285 } 288 }
286 289
287 void ShellBrowserMainParts::CreateExtensionSystem() { 290 void ShellBrowserMainParts::CreateExtensionSystem() {
288 DCHECK(browser_context_); 291 DCHECK(browser_context_);
289 extension_system_ = static_cast<ShellExtensionSystem*>( 292 extension_system_ = static_cast<ShellExtensionSystem*>(
290 ExtensionSystem::Get(browser_context_.get())); 293 ExtensionSystem::Get(browser_context_.get()));
291 extension_system_->InitForRegularProfile(true); 294 extension_system_->InitForRegularProfile(true);
292 } 295 }
293 296
294 } // namespace extensions 297 } // namespace extensions
OLDNEW
« no previous file with comments | « device/usb/usb_service_linux.cc ('k') | extensions/shell/browser/shell_device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698