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

Unified Diff: ash/display/display_manager_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/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/projecting_observer_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 31de493e3a9d3ba9c59db0740fce1c1a096e1533..63e971a0f493397cf18ca4b673771278545eaaa5 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1546,7 +1546,7 @@ TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScalingNoOverride) {
const gfx::Insets dummy_overscan_insets;
display_manager()->RegisterDisplayProperty(
display_id, display::Display::ROTATE_0, 1.0f, &dummy_overscan_insets,
- gfx::Size(), 1.0f, ui::ColorCalibrationProfile(), nullptr);
+ gfx::Size(), 1.0f, display::ColorCalibrationProfile(), nullptr);
// Setup the display modes with UI-scale.
display::ManagedDisplayInfo native_display_info =
@@ -2506,7 +2506,7 @@ TEST_P(DisplayManagerTest, CheckInitializationOfRotationProperty) {
int64_t id = display_manager()->GetDisplayAt(0).id();
display_manager()->RegisterDisplayProperty(
id, display::Display::ROTATE_90, 1.0f, nullptr, gfx::Size(), 1.0f,
- ui::COLOR_PROFILE_STANDARD, nullptr);
+ display::COLOR_PROFILE_STANDARD, nullptr);
const display::ManagedDisplayInfo& info =
display_manager()->GetDisplayInfo(id);
« no previous file with comments | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/projecting_observer_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698