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

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

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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
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 05b312f0f0740b273349a3ce608cf808d27d816e..667e4ae0790765596ef11e5c0dd4dab744f65ad9 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -253,7 +253,7 @@ void StoreCurrentDisplayProperties() {
for (size_t i = 0; i < num; ++i) {
const display::Display& display = display_manager->GetDisplayAt(i);
int64_t id = display.id();
- ash::DisplayInfo info = display_manager->GetDisplayInfo(id);
+ display::ManagedDisplayInfo info = display_manager->GetDisplayInfo(id);
std::unique_ptr<base::DictionaryValue> property_value(
new base::DictionaryValue());
@@ -267,7 +267,7 @@ void StoreCurrentDisplayProperties() {
property_value->SetInteger(
"ui-scale", static_cast<int>(info.configured_ui_scale() * 1000));
- scoped_refptr<ash::ManagedDisplayMode> mode =
+ scoped_refptr<display::ManagedDisplayMode> mode =
display_manager->GetSelectedModeForDisplayId(id);
if (!display.IsInternal() && mode && !mode->native()) {
property_value->SetInteger("width", mode->size().width());
« no previous file with comments | « ash/wm/panels/panel_layout_manager_unittest.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