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

Unified Diff: ui/display/manager/display_manager.h

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
Index: ui/display/manager/display_manager.h
diff --git a/ui/display/manager/display_manager.h b/ui/display/manager/display_manager.h
index 85bfc263f8f4b402f7fa48c2cadb7f3853a22dab..604508a64f1843d88b46fd351181bc380703a728 100644
--- a/ui/display/manager/display_manager.h
+++ b/ui/display/manager/display_manager.h
@@ -50,7 +50,7 @@ class DisplayManagerTestApi;
// and notifies observers when configuration changes.
class DISPLAY_MANAGER_EXPORT DisplayManager
#if defined(OS_CHROMEOS)
- : public ui::DisplayConfigurator::SoftwareMirroringController
+ : public DisplayConfigurator::SoftwareMirroringController
#endif
{
public:
@@ -72,8 +72,8 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
virtual void PostDisplayConfigurationChange(bool must_clear_window) = 0;
#if defined(OS_CHROMEOS)
- // Get the ui::DisplayConfigurator.
- virtual ui::DisplayConfigurator* display_configurator() = 0;
+ // Get the DisplayConfigurator.
+ virtual DisplayConfigurator* display_configurator() = 0;
#endif
};
@@ -179,7 +179,7 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
const gfx::Insets* overscan_insets,
const gfx::Size& resolution_in_pixels,
float device_scale_factor,
- ui::ColorCalibrationProfile color_profile,
+ ColorCalibrationProfile color_profile,
const TouchCalibrationData* touch_calibration_data);
// Register stored rotation properties for the internal display.
@@ -217,7 +217,7 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
// Sets the color calibration of the display to |profile|.
void SetColorCalibrationProfile(int64_t display_id,
- ui::ColorCalibrationProfile profile);
+ ColorCalibrationProfile profile);
// Called when display configuration has changed. The new display
// configurations is passed as a vector of Display object, which contains each
« no previous file with comments | « ui/display/manager/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc ('k') | ui/display/manager/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698