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

Unified Diff: ash/wm/lock_state_controller_unittest.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/touch/touch_observer_hud.cc ('k') | ash/wm/power_button_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/lock_state_controller_unittest.cc
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index 5a96bbb5408dc259b030db3633b89a962b5c2945..fd6c6b1d42a33b90d0b34735d2eeb4331f50b4ab 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -902,21 +902,21 @@ TEST_F(LockStateControllerTest, IgnorePowerButtonIfScreenIsOff) {
TEST_F(LockStateControllerTest, HonorPowerButtonInDockedMode) {
// Create two outputs, the first internal and the second external.
- ui::DisplayConfigurator::DisplayStateList outputs;
+ display::DisplayConfigurator::DisplayStateList outputs;
- std::unique_ptr<ui::DisplaySnapshot> internal_display =
+ std::unique_ptr<display::DisplaySnapshot> internal_display =
display::FakeDisplaySnapshot::Builder()
.SetId(123)
.SetNativeMode(gfx::Size(1, 1))
- .SetType(ui::DISPLAY_CONNECTION_TYPE_INTERNAL)
+ .SetType(display::DISPLAY_CONNECTION_TYPE_INTERNAL)
.Build();
outputs.push_back(internal_display.get());
- std::unique_ptr<ui::DisplaySnapshot> external_display =
+ std::unique_ptr<display::DisplaySnapshot> external_display =
display::FakeDisplaySnapshot::Builder()
.SetId(456)
.SetNativeMode(gfx::Size(1, 1))
- .SetType(ui::DISPLAY_CONNECTION_TYPE_HDMI)
+ .SetType(display::DISPLAY_CONNECTION_TYPE_HDMI)
.Build();
outputs.push_back(external_display.get());
« no previous file with comments | « ash/touch/touch_observer_hud.cc ('k') | ash/wm/power_button_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698