Chromium Code Reviews| 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 b434e05a351ea745f1697e87a3a03d1cc0a3fb68..cada36d8aa05b175455d1229f4609051aae928c2 100644 |
| --- a/ash/display/display_color_manager_chromeos.h |
| +++ b/ash/display/display_color_manager_chromeos.h |
| @@ -52,18 +52,26 @@ class ASH_EXPORT DisplayColorManager |
| std::vector<ui::GammaRampRGBEntry> lut; |
| }; |
| + void FinishLoadCalibrationForDisplay(int64_t display_id, |
|
stevenjb
2016/02/29 20:22:29
Does this need to be public? Public methods should
Greg Levin
2016/03/02 00:00:26
Made private.
|
| + int64_t product_id, |
| + const base::FilePath&, |
| + bool file_downloaded); |
| + |
| + void SetOnFinishedForTest(base::Closure on_finished_for_test) { |
| + on_finished_for_test_ = on_finished_for_test; |
| + } |
| + |
| private: |
| void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id); |
| void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display); |
| - void UpdateCalibrationData( |
| - int64_t display_id, |
| - int64_t product_id, |
| - scoped_ptr<DisplayColorManager::ColorCalibrationData> data, |
| - bool success); |
| + void UpdateCalibrationData(int64_t display_id, |
| + int64_t product_id, |
| + scoped_ptr<ColorCalibrationData> data); |
| ui::DisplayConfigurator* configurator_; |
| std::map<int64_t, ColorCalibrationData*> calibration_map_; |
| base::SequencedWorkerPool* blocking_pool_; |
| + base::Closure on_finished_for_test_; |
| DISALLOW_COPY_AND_ASSIGN(DisplayColorManager); |
| }; |