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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2427913003: Use mojo volume interfaces for mash and classic ash. (Closed)
Patch Set: Split volume and system events observers; only hook up volume. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 6fd01a40014b7e239c46d458cea2c905f8559487..ea5313bacc10e177f5529f30cc4bf23935a416ef 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -45,6 +45,7 @@
#include "chrome/browser/chromeos/events/event_rewriter_controller.h"
#include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
#include "chrome/browser/chromeos/extensions/default_app_order.h"
+#include "chrome/browser/chromeos/extensions/extension_volume_observer.h"
#include "chrome/browser/chromeos/external_metrics.h"
#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ -670,23 +671,25 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
SetGuestLocale(profile());
- peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
+ // This observer uses the intialized profile to dispatch extension events.
+ extension_volume_observer_ = base::MakeUnique<ExtensionVolumeObserver>();
- renderer_freezer_.reset(
- new RendererFreezer(std::unique_ptr<RendererFreezer::Delegate>(
- new FreezerCgroupProcessManager())));
+ peripheral_battery_observer_ = base::MakeUnique<PeripheralBatteryObserver>();
+
+ renderer_freezer_ = base::MakeUnique<RendererFreezer>(
+ base::MakeUnique<FreezerCgroupProcessManager>());
g_browser_process->platform_part()->InitializeAutomaticRebootManager();
g_browser_process->platform_part()->InitializeDeviceDisablingManager();
// This observer cannot be created earlier because it requires the shell to be
// available.
- idle_action_warning_observer_.reset(new IdleActionWarningObserver());
+ idle_action_warning_observer_ = base::MakeUnique<IdleActionWarningObserver>();
// Start watching for low disk space events to notify the user if it is not a
// guest profile.
if (!user_manager::UserManager::Get()->IsLoggedInAsGuest())
- low_disk_notification_.reset(new LowDiskNotification());
+ low_disk_notification_ = base::MakeUnique<LowDiskNotification>();
// Authenticate the user for PIN quick unlock.
PinStorage* pin_storage = PinStorageFactory::GetForProfile(profile());
@@ -798,6 +801,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// We should remove observers attached to D-Bus clients before
// DBusThreadManager is shut down.
+ extension_volume_observer_.reset();
peripheral_battery_observer_.reset();
power_prefs_.reset();
renderer_freezer_.reset();
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/chrome_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698