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

Unified Diff: ash/display/display_layout_store.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/display/display_layout_store.h ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_layout_store.cc
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index 436b1937d493d960897118bcc0189a86335a4dfa..466adbf4920b35c4f314cb77c7787d23e7524a58 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -6,8 +6,6 @@
#include "ash/ash_switches.h"
#include "ash/display/display_layout_store.h"
-#include "ash/display/display_manager.h"
-#include "ash/shell.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "ui/gfx/display.h"
@@ -69,13 +67,11 @@
pair.first == layout.primary_id) ? layout : layout.Invert();
}
-void DisplayLayoutStore::UpdateMultiDisplayState(const DisplayIdPair& pair,
- bool mirrored,
- bool default_unified) {
+void DisplayLayoutStore::UpdateMirrorStatus(const DisplayIdPair& pair,
+ bool mirrored) {
if (paired_layouts_.find(pair) == paired_layouts_.end())
CreateDisplayLayout(pair);
paired_layouts_[pair].mirrored = mirrored;
- paired_layouts_[pair].default_unified = default_unified;
}
void DisplayLayoutStore::UpdatePrimaryDisplayId(const DisplayIdPair& pair,
@@ -88,9 +84,6 @@
DisplayLayout DisplayLayoutStore::CreateDisplayLayout(
const DisplayIdPair& pair) {
DisplayLayout layout = default_display_layout_;
- layout.default_unified =
- Shell::GetInstance()->display_manager()->default_multi_display_mode() ==
- DisplayManager::UNIFIED;
layout.primary_id = pair.first;
paired_layouts_[pair] = layout;
return layout;
« no previous file with comments | « ash/display/display_layout_store.h ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698