| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 14b7fd48fae11a4f575dd74faef7846c11b7cb85..c7a077c15d25ae1e18527f3ae51a30562059b88c 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_refptr<DisplayColorManager> display_color_manager_;
|
| scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
|
| scoped_ptr<DisplayErrorObserver> display_error_observer_;
|
| scoped_ptr<ProjectingObserver> projecting_observer_;
|
|
|