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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/cursor_window_controller_unittest.cc ('k') | ash/display/display_color_manager_chromeos.cc » ('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 a9303c0e3f9531e10d428b69cb35f38232e7324e..6830176cfcd6d0b9dc04096185973897e7484b21 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -24,13 +24,13 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/user_activity/user_activity_detector.h"
#include "ui/compositor/dip_util.h"
+#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
#include "ui/display/types/display_mode.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/display/util/display_util.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/touchscreen_device.h"
-#include "ui/gfx/display.h"
namespace ash {
@@ -65,9 +65,9 @@ void UpdateInternalDisplayId(
const ui::DisplayConfigurator::DisplayStateList& display_states) {
for (auto* state : display_states) {
if (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL) {
- if (gfx::Display::HasInternalDisplay())
- DCHECK_EQ(gfx::Display::InternalDisplayId(), state->display_id());
- gfx::Display::SetInternalDisplayId(state->display_id());
+ if (display::Display::HasInternalDisplay())
+ DCHECK_EQ(display::Display::InternalDisplayId(), state->display_id());
+ display::Display::SetInternalDisplayId(state->display_id());
}
}
}
« no previous file with comments | « ash/display/cursor_window_controller_unittest.cc ('k') | ash/display/display_color_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698