| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| index eec14c13a0dade43685843604105273b3e2255eb..e576ed1961af091a91ea87656197f0aa9629c66e 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| @@ -18,18 +18,18 @@ class ContactManager;
|
| namespace chromeos {
|
|
|
| class BrightnessObserver;
|
| +class DisplayConfigurationObserver;
|
| class KioskAppLauncher;
|
| class MagnificationManager;
|
| class OutputObserver;
|
| class PowerButtonObserver;
|
| class PowerStateOverride;
|
| -class PrimaryDisplaySwitchObserver;
|
| -class StorageMonitorCros;
|
| class ResumeObserver;
|
| class ScreenDimmingObserver;
|
| class ScreenLockObserver;
|
| class ScreensaverController;
|
| class SessionManagerObserver;
|
| +class StorageMonitorCros;
|
| class SuspendObserver;
|
| class UserActivityNotifier;
|
| class VideoActivityNotifier;
|
| @@ -75,6 +75,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
|
|
|
| scoped_ptr<contacts::ContactManager> contact_manager_;
|
| scoped_ptr<BrightnessObserver> brightness_observer_;
|
| + scoped_ptr<DisplayConfigurationObserver> display_configuration_observer_;
|
| scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
|
| scoped_ptr<OutputObserver> output_observer_;
|
| scoped_ptr<SuspendObserver> suspend_observer_;
|
| @@ -83,7 +84,6 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
|
| scoped_ptr<ScreensaverController> screensaver_controller_;
|
| scoped_ptr<PowerButtonObserver> power_button_observer_;
|
| scoped_refptr<PowerStateOverride> power_state_override_;
|
| - scoped_ptr<PrimaryDisplaySwitchObserver> primary_display_switch_observer_;
|
| scoped_ptr<UserActivityNotifier> user_activity_notifier_;
|
| scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
|
| scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;
|
|
|