| 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 618af72aa3837bcb4afd990e4140864dd76da6bb..f4b434211892ef5ba6f8ad9169d3dcca5d8410f4 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -31,7 +31,6 @@
|
| #include "chrome/browser/chromeos/boot_times_loader.h"
|
| #include "chrome/browser/chromeos/contacts/contact_manager.h"
|
| #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
|
| -#include "chrome/browser/chromeos/display/display_configuration_observer.h"
|
| #include "chrome/browser/chromeos/extensions/default_app_order.h"
|
| #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
|
| #include "chrome/browser/chromeos/external_metrics.h"
|
| @@ -615,9 +614,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
|
|
| peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
|
|
|
| - display_configuration_observer_.reset(
|
| - new DisplayConfigurationObserver());
|
| -
|
| g_browser_process->platform_part()->InitializeAutomaticRebootManager();
|
|
|
| // This observer cannot be created earlier because it requires the shell to be
|
| @@ -719,10 +715,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| imageburner::BurnManager::Shutdown();
|
| CrasAudioHandler::Shutdown();
|
|
|
| - // Let classes unregister themselves as observers of the ash::Shell singleton
|
| - // before the shell is destroyed.
|
| - display_configuration_observer_.reset();
|
| -
|
| // Detach D-Bus clients before DBusThreadManager is shut down.
|
| power_button_observer_.reset();
|
| idle_action_warning_observer_.reset();
|
|
|