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

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

Issue 12438016: Save display preference when all display configuration changes has been completed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: replace dcheck Created 7 years, 9 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
« no previous file with comments | « ash/display/display_manager.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ash/display/display_manager.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698