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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/window_tree_host_manager.cc

Issue 2223063003: Move DisplayLayoutStore from ash to ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase/add TODO. Created 4 years, 4 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/mouse_cursor_event_filter_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/window_tree_host_manager.cc
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index 8b635266b36ac8c34445ada3393c5d2d77dbc692..cdfa2ae65e7041255ae726c6f8ff7f686ef4a4ba 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -13,7 +13,6 @@
#include "ash/common/ash_switches.h"
#include "ash/common/system/tray/system_tray.h"
#include "ash/display/cursor_window_controller.h"
-#include "ash/display/display_layout_store.h"
#include "ash/display/display_manager.h"
#include "ash/display/mirror_window_controller.h"
#include "ash/display/root_window_transformers.h"
@@ -45,6 +44,7 @@
#include "ui/compositor/compositor.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_layout_store.h"
#include "ui/display/screen.h"
#include "ui/wm/core/coordinate_conversion.h"
#include "ui/wm/public/activation_client.h"
@@ -766,7 +766,7 @@ void WindowTreeHostManager::PostDisplayConfigurationChange() {
focus_activation_store_->Restore();
DisplayManager* display_manager = GetDisplayManager();
- DisplayLayoutStore* layout_store = display_manager->layout_store();
+ display::DisplayLayoutStore* layout_store = display_manager->layout_store();
if (display_manager->num_connected_displays() > 1) {
display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
const display::DisplayLayout& layout =
« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698