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

Unified Diff: chrome/browser/chromeos/display/display_preferences.cc

Issue 289583002: Lock rotation when screen is manually rotated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
Index: chrome/browser/chromeos/display/display_preferences.cc
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index 7055eec03b1d98b6860233c5fd8ceba4ab01bca4..968a81b3d7232c14e4c1f8b19adbf211aeabce7e 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -7,8 +7,8 @@
#include "ash/display/display_layout_store.h"
#include "ash/display/display_manager.h"
#include "ash/display/display_pref_util.h"
-#include "ash/display/resolution_notification_controller.h"
#include "ash/shell.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
oshima 2014/05/23 20:00:57 nit: you don't need this?
jonross 2014/05/26 19:05:48 Done.
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
#include "base/prefs/scoped_user_pref_update.h"
@@ -305,10 +305,9 @@ void StoreDisplayPrefs() {
// Do not store prefs when the confirmation dialog is shown.
if (!UserCanSaveDisplayPreference() ||
- ash::Shell::GetInstance()->resolution_notification_controller()->
- DoesNotificationTimeout()) {
+ !ash::Shell::GetInstance()->ShouldSaveDisplaySettings())
flackr 2014/05/26 16:05:18 nit: curlies necessary { }.
jonross 2014/05/26 19:05:48 Done.
return;
- }
+
StoreCurrentDisplayLayoutPrefs();
StoreCurrentDisplayProperties();
}

Powered by Google App Engine
This is Rietveld 408576698