Revert of Load and apply a vcgt table from an ICC file to the internal display

ash/shell.h

 // Copyright (c) 2012 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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 65 matching lines @@
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class AppListController;
 class AshNativeCursorManager;
 class AutoclickController;
 class BluetoothNotificationController;
 class CaptureController;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
-class DisplayColorManager;
 class DisplayConfiguratorAnimation;
 class DisplayController;
 class DisplayErrorObserver;
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class EventTransformationHandler;
 class FirstRunHelper;
 class FocusCycler;
@@ skipping 622 matching lines @@
   scoped_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   scoped_ptr<LastWindowClosedLogoutReminder>
       last_window_closed_logout_reminder_;
   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_;
 
   // Listens for output changes and updates the display manager.
   scoped_ptr<DisplayChangeObserver> display_change_observer_;
 
   // Implements content::ScreenOrientationController for ChromeOS
   scoped_ptr<ScreenOrientationController> screen_orientation_controller_;
 
@@ skipping 26 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_