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

Unified Diff: ui/display/manager/chromeos/test/test_native_display_delegate.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
Index: ui/display/manager/chromeos/test/test_native_display_delegate.cc
diff --git a/ui/display/manager/chromeos/test/test_native_display_delegate.cc b/ui/display/manager/chromeos/test/test_native_display_delegate.cc
index 9cd1bda4897fafa58aa03009d95a64112241aec9..cee826bb621765ef8e35da1756ecb5dfd9ddfb0f 100644
--- a/ui/display/manager/chromeos/test/test_native_display_delegate.cc
+++ b/ui/display/manager/chromeos/test/test_native_display_delegate.cc
@@ -12,7 +12,7 @@
#include "ui/display/types/display_mode.h"
#include "ui/display/types/native_display_observer.h"
-namespace ui {
+namespace display {
namespace test {
TestNativeDisplayDelegate::TestNativeDisplayDelegate(ActionLogger* log)
@@ -127,20 +127,20 @@ void TestNativeDisplayDelegate::SetHDCPState(
callback.Run(set_hdcp_expectation_);
}
-std::vector<ui::ColorCalibrationProfile>
+std::vector<ColorCalibrationProfile>
TestNativeDisplayDelegate::GetAvailableColorCalibrationProfiles(
const DisplaySnapshot& output) {
- return std::vector<ui::ColorCalibrationProfile>();
+ return std::vector<ColorCalibrationProfile>();
}
bool TestNativeDisplayDelegate::SetColorCalibrationProfile(
const DisplaySnapshot& output,
- ui::ColorCalibrationProfile new_profile) {
+ ColorCalibrationProfile new_profile) {
return false;
}
bool TestNativeDisplayDelegate::SetColorCorrection(
- const ui::DisplaySnapshot& output,
+ const DisplaySnapshot& output,
const std::vector<GammaRampRGBEntry>& degamma_lut,
const std::vector<GammaRampRGBEntry>& gamma_lut,
const std::vector<float>& correction_matrix) {
@@ -158,10 +158,9 @@ void TestNativeDisplayDelegate::RemoveObserver(
observers_.RemoveObserver(observer);
}
-display::FakeDisplayController*
-TestNativeDisplayDelegate::GetFakeDisplayController() {
+FakeDisplayController* TestNativeDisplayDelegate::GetFakeDisplayController() {
return nullptr;
}
} // namespace test
-} // namespace ui
+} // namespace display
« no previous file with comments | « ui/display/manager/chromeos/test/test_native_display_delegate.h ('k') | ui/display/manager/chromeos/touchscreen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698