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

Unified Diff: chrome/browser/chromeos/display/display_preferences.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
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 93406743d3bec3a5f761a68fd180cab0f26a9b68..18e054b09e90b4c8bbf74888b14e62d8170484f6 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -15,7 +15,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
-#include "base/sys_info.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/pref_names.h"
@@ -228,7 +227,8 @@
void StoreCurrentDisplayLayoutPrefs() {
ash::DisplayManager* display_manager = GetDisplayManager();
if (!UserCanSaveDisplayPreference() ||
- display_manager->num_connected_displays() < 2) {
+ display_manager->num_connected_displays() < 2 ||
+ display_manager->IsInUnifiedMode()) {
return;
}
« no previous file with comments | « ash/test/display_manager_test_api.cc ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698