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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/display/display_preferences.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/test/display_manager_test_api.cc ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2ae81319e3fdf1aa6126a189b0f2bc0bc67b351e..eb614874713a63fc2f783d9e8a4aa3cd83f1d282 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -6,7 +6,6 @@
#include <stddef.h>
-#include "ash/display/display_layout_store.h"
#include "ash/display/display_manager.h"
#include "ash/display/display_pref_util.h"
#include "ash/display/display_util.h"
@@ -26,6 +25,7 @@
#include "components/user_manager/user_manager.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/display/display.h"
+#include "ui/display/manager/display_layout_store.h"
#include "ui/gfx/geometry/insets.h"
#include "url/url_canon.h"
#include "url/url_util.h"
@@ -111,7 +111,8 @@ bool UserCanSaveDisplayPreference() {
void LoadDisplayLayouts() {
PrefService* local_state = g_browser_process->local_state();
- ash::DisplayLayoutStore* layout_store = GetDisplayManager()->layout_store();
+ display::DisplayLayoutStore* layout_store =
+ GetDisplayManager()->layout_store();
const base::DictionaryValue* layouts = local_state->GetDictionary(
prefs::kSecondaryDisplays);
« 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