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

Unified Diff: ash/display/display_color_manager_chromeos.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
« no previous file with comments | « ash/display/display_animator_chromeos.cc ('k') | ash/display/display_color_manager_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_color_manager_chromeos.h
diff --git a/ash/display/display_color_manager_chromeos.h b/ash/display/display_color_manager_chromeos.h
index 4939b8ae3b76e58f4bd563a097b78929b9af6d1d..c87c7277ff108930ff7217475e2b3b83749a98cf 100644
--- a/ash/display/display_color_manager_chromeos.h
+++ b/ash/display/display_color_manager_chromeos.h
@@ -23,45 +23,46 @@ namespace base {
class SequencedWorkerPool;
}
-namespace ui {
+namespace display {
class DisplaySnapshot;
struct GammaRampRGBEntry;
-} // namespace ui
+} // namespace display
namespace ash {
// An object that observes changes in display configuration applies any color
// calibration where needed.
class ASH_EXPORT DisplayColorManager
- : public ui::DisplayConfigurator::Observer {
+ : public display::DisplayConfigurator::Observer {
public:
- DisplayColorManager(ui::DisplayConfigurator* configurator,
+ DisplayColorManager(display::DisplayConfigurator* configurator,
base::SequencedWorkerPool* blocking_pool);
~DisplayColorManager() override;
- // ui::DisplayConfigurator::Observer
+ // display::DisplayConfigurator::Observer
void OnDisplayModeChanged(
- const ui::DisplayConfigurator::DisplayStateList& outputs) override;
+ const display::DisplayConfigurator::DisplayStateList& outputs) override;
void OnDisplayModeChangeFailed(
- const ui::DisplayConfigurator::DisplayStateList& displays,
- ui::MultipleDisplayState failed_new_state) override {}
+ const display::DisplayConfigurator::DisplayStateList& displays,
+ display::MultipleDisplayState failed_new_state) override {}
struct ColorCalibrationData {
ColorCalibrationData();
~ColorCalibrationData();
- std::vector<ui::GammaRampRGBEntry> degamma_lut;
- std::vector<ui::GammaRampRGBEntry> gamma_lut;
+ std::vector<display::GammaRampRGBEntry> degamma_lut;
+ std::vector<display::GammaRampRGBEntry> gamma_lut;
std::vector<float> correction_matrix;
};
protected:
- virtual void FinishLoadCalibrationForDisplay(int64_t display_id,
- int64_t product_id,
- bool has_color_correction_matrix,
- ui::DisplayConnectionType type,
- const base::FilePath& path,
- bool file_downloaded);
+ virtual void FinishLoadCalibrationForDisplay(
+ int64_t display_id,
+ int64_t product_id,
+ bool has_color_correction_matrix,
+ display::DisplayConnectionType type,
+ const base::FilePath& path,
+ bool file_downloaded);
virtual void UpdateCalibrationData(
int64_t display_id,
int64_t product_id,
@@ -69,9 +70,9 @@ class ASH_EXPORT DisplayColorManager
private:
void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id);
- void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display);
+ void LoadCalibrationForDisplay(const display::DisplaySnapshot* display);
- ui::DisplayConfigurator* configurator_;
+ display::DisplayConfigurator* configurator_;
std::map<int64_t, std::unique_ptr<ColorCalibrationData>> calibration_map_;
base::ThreadChecker thread_checker_;
base::SequencedWorkerPool* blocking_pool_;
« no previous file with comments | « ash/display/display_animator_chromeos.cc ('k') | ash/display/display_color_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698