Reland "Load and apply a vcgt table from an ICC file to the internal display"

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 14b7fd48fae11a4f575dd74faef7846c11b7cb85..cb46540be67024994d76283a444bec82bd950b68 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -83,6 +83,7 @@ class BluetoothNotificationController;
 class CaptureController;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
+class DisplayColorManager;
 class DisplayConfiguratorAnimation;
 class DisplayController;
 class DisplayErrorObserver;
@@ -725,6 +726,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   // Controls video output device state.
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
+  scoped_ptr<DisplayColorManager> display_color_manager_;
   scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;