Add support for more advanced color correction

ash/display/display_color_manager_chromeos.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
 #define ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 31 matching lines @@
   void OnDisplayModeChanged(
       const ui::DisplayConfigurator::DisplayStateList& outputs) override;
   void OnDisplayModeChangeFailed(
       const ui::DisplayConfigurator::DisplayStateList& displays,
       ui::MultipleDisplayState failed_new_state) override {}
 
   struct ColorCalibrationData {
     ColorCalibrationData();
     ~ColorCalibrationData();
 
-    std::vector<ui::GammaRampRGBEntry> lut;
+    std::vector<ui::GammaRampRGBEntry> degamma_lut;
+    std::vector<ui::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 UpdateCalibrationData(int64_t display_id,
                                      int64_t product_id,
                                      scoped_ptr<ColorCalibrationData> data);
 
  private:
   void ApplyDisplayColorCalibration(int64_t display_id, int64_t product_id);
   void LoadCalibrationForDisplay(const ui::DisplaySnapshot* display);
 
   ui::DisplayConfigurator* configurator_;
   std::map<int64_t, ColorCalibrationData*> calibration_map_;
   base::ThreadChecker thread_checker_;
   base::SequencedWorkerPool* blocking_pool_;
 
   // Factory for callbacks.
   base::WeakPtrFactory<DisplayColorManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayColorManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_COLOR_MANAGER_CHROMEOS_H_