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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 1149063004: Revert of Save and restore unified mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/screen_util_unittest.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 1a96264756a2b0e3d5c7f60fe2360a04b7f29f25..d7dc9b5623fa2c35b446e4d5f695c7889076cf8f 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -486,9 +486,11 @@
#if defined(OS_CHROMEOS)
bool Shell::ShouldSaveDisplaySettings() {
+ // TODO(oshima): Allow saving the settings even in unified desktop mode.
return !(screen_orientation_controller_
->ignore_display_configuration_updates() ||
- resolution_notification_controller_->DoesNotificationTimeout());
+ resolution_notification_controller_->DoesNotificationTimeout()) &&
+ !switches::UnifiedDesktopEnabled();
}
#endif
« no previous file with comments | « ash/screen_util_unittest.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698