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

Unified Diff: ash/system/chromeos/rotation/tray_rotation_lock_unittest.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/system/chromeos/rotation/tray_rotation_lock.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
diff --git a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
index 635bd9ed32d440d1a5e1df80fe3f9f6d0f65d160..1dfd6f460f896b705aed909d6935992ad01600f3 100644
--- a/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/chromeos/rotation/tray_rotation_lock_unittest.cc
@@ -244,14 +244,14 @@ TEST_F(TrayRotationLockTest, PerformActionOnDefaultView) {
// Tests that when the tray is created without the internal display being known,
// that it will still display correctly once the internal display is known.
TEST_F(TrayRotationLockTest, InternalDisplayNotAvailableAtCreation) {
- int64_t internal_display_id = gfx::Display::InternalDisplayId();
+ int64_t internal_display_id = display::Display::InternalDisplayId();
TearDownViews();
- gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
+ display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
std::unique_ptr<TrayRotationLock> tray(new TrayRotationLock(
StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray()));
- gfx::Display::SetInternalDisplayId(internal_display_id);
+ display::Display::SetInternalDisplayId(internal_display_id);
std::unique_ptr<views::View> tray_view(CreateTrayView(tray.get()));
std::unique_ptr<views::View> default_view(tray->CreateDefaultView(
StatusAreaWidgetTestHelper::GetUserLoginStatus()));
« no previous file with comments | « ash/system/chromeos/rotation/tray_rotation_lock.cc ('k') | ash/system/chromeos/tray_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698