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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 2286523002: Relocate reuseable portions of ash/display/display_util.* (Closed)
Patch Set: fixed ozone build 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/accelerators/accelerator_commands_aura.cc ('k') | ash/display/display_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 9a1473c78f0e20a31123d49f48f975411a9a49ea..bcf8e7b80aee99490bd9bfc38cbb0518d7d82eee 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -26,6 +26,7 @@
#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
#include "ui/display/manager/display_layout_store.h"
+#include "ui/display/manager/display_manager_utilities.h"
#include "ui/display/types/display_mode.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/display/util/display_util.h"
@@ -86,7 +87,7 @@ DisplayChangeObserver::GetInternalManagedDisplayModeList(
ui_native_mode->is_interlaced(), true,
1.0, display_info.device_scale_factor());
- return CreateInternalManagedDisplayModeList(native_mode);
+ return display::CreateInternalManagedDisplayModeList(native_mode);
}
// static
@@ -165,11 +166,11 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
UpdateInternalDisplayId(display_states);
if (display_states.size() == 1)
return ui::MULTIPLE_DISPLAY_STATE_SINGLE;
- display::DisplayIdList list =
- GenerateDisplayIdList(display_states.begin(), display_states.end(),
- [](const ui::DisplaySnapshot* display_state) {
- return display_state->display_id();
- });
+ display::DisplayIdList list = display::GenerateDisplayIdList(
+ display_states.begin(), display_states.end(),
+ [](const ui::DisplaySnapshot* display_state) {
+ return display_state->display_id();
+ });
const display::DisplayLayout& layout = Shell::GetInstance()
->display_manager()
« no previous file with comments | « ash/accelerators/accelerator_commands_aura.cc ('k') | ash/display/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698