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

Unified Diff: ui/display/manager/chromeos/x11/native_display_delegate_x11.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/chromeos/x11/native_display_delegate_x11.h
diff --git a/ui/display/manager/chromeos/x11/native_display_delegate_x11.h b/ui/display/manager/chromeos/x11/native_display_delegate_x11.h
index fb3536eb6c92eeb6aa1faaabc8df91e312a3b152..09d1c207258ef6450fb884d4676c88220f5a5999 100644
--- a/ui/display/manager/chromeos/x11/native_display_delegate_x11.h
+++ b/ui/display/manager/chromeos/x11/native_display_delegate_x11.h
@@ -41,7 +41,7 @@ extern "C" {
void XRRFreeScreenResources(XRRScreenResources* resources);
}
-namespace ui {
+namespace display {
class DisplayModeX11;
class DisplaySnapshotX11;
@@ -98,13 +98,13 @@ class DISPLAY_MANAGER_EXPORT NativeDisplayDelegateX11
const DisplaySnapshot& output) override;
bool SetColorCalibrationProfile(const DisplaySnapshot& output,
ColorCalibrationProfile new_profile) override;
- bool SetColorCorrection(const ui::DisplaySnapshot& output,
+ bool SetColorCorrection(const DisplaySnapshot& output,
const std::vector<GammaRampRGBEntry>& degamma_lut,
const std::vector<GammaRampRGBEntry>& gamma_lut,
const std::vector<float>& correction_matrix) override;
void AddObserver(NativeDisplayObserver* observer) override;
void RemoveObserver(NativeDisplayObserver* observer) override;
- display::FakeDisplayController* GetFakeDisplayController() override;
+ FakeDisplayController* GetFakeDisplayController() override;
private:
class HelperDelegateX11;
@@ -175,6 +175,6 @@ class DISPLAY_MANAGER_EXPORT NativeDisplayDelegateX11
DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
};
-} // namespace ui
+} // namespace display
#endif // UI_DISPLAY_MANAGER_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_

Powered by Google App Engine
This is Rietveld 408576698