Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index c0a555f40681e5d46a5b04c2d86df0c626e18f93..e6b197f8d0fb837a696b46cc0a06b7145c4794db 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -13,6 +13,7 @@ |
| #include "ash/desktop_background/desktop_background_view.h" |
| #include "ash/drag_drop/drag_drop_controller.h" |
| #include "ash/focus_cycler.h" |
| +#include "ash/high_contrast/high_contrast_controller.h" |
| #include "ash/launcher/launcher.h" |
| #include "ash/magnifier/magnification_controller.h" |
| #include "ash/monitor/monitor_controller.h" |
| @@ -738,12 +739,15 @@ void Shell::Init() { |
| drag_drop_controller_.reset(new internal::DragDropController); |
| magnification_controller_.reset(new internal::MagnificationController); |
| + high_contrast_controller_.reset(new HighContrastController); |
| power_button_controller_.reset(new PowerButtonController); |
| AddShellObserver(power_button_controller_.get()); |
| video_detector_.reset(new VideoDetector); |
| window_cycle_controller_.reset(new WindowCycleController); |
| monitor_controller_.reset(new internal::MonitorController); |
| screen_dimmer_.reset(new internal::ScreenDimmer); |
| + |
| + //high_contrast_controller_->SetEnabled(delegate_->IsHighContrastEnabled()); |
|
sky
2012/05/17 15:54:15
Remove this
Zachary Kuznia
2012/05/21 05:50:05
Done.
|
| } |
| aura::Window* Shell::GetContainer(int container_id) { |