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

Unified Diff: ash/content/display/display_color_manager_chromeos.h

Issue 1129863003: Load ICC file for display color correction based on display product identifier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nuked extra {} Created 5 years, 7 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 | « no previous file | ash/content/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/content/display/display_color_manager_chromeos.h
diff --git a/ash/content/display/display_color_manager_chromeos.h b/ash/content/display/display_color_manager_chromeos.h
index 7f21c329c3d29d8db8df5917837a277204fb14b8..607df4d9db451148251febc1ce06beabc1ef594f 100644
--- a/ash/content/display/display_color_manager_chromeos.h
+++ b/ash/content/display/display_color_manager_chromeos.h
@@ -46,17 +46,16 @@ class ASH_EXPORT DisplayColorManager
};
private:
- void ApplyDisplayColorCalibration(uint64_t display_id);
- void LoadInternalFromCommandLine();
- void LoadCalibrationForDisplay(int64_t display_id,
- const base::FilePath& path);
+ void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id);
+ void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display);
void UpdateCalibrationData(
- uint64_t display_id,
+ int64_t display_id,
+ int64_t product_id,
scoped_ptr<DisplayColorManager::ColorCalibrationData> data,
bool success);
ui::DisplayConfigurator* configurator_;
- std::map<uint64_t, ColorCalibrationData*> calibration_map_;
+ std::map<int64_t, ColorCalibrationData*> calibration_map_;
DISALLOW_COPY_AND_ASSIGN(DisplayColorManager);
};
« no previous file with comments | « no previous file | ash/content/display/display_color_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698