Index: chrome/browser/chrome_browser_main_extra_parts_ash.cc |
diff --git a/chrome/browser/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/chrome_browser_main_extra_parts_ash.cc |
index cf529c91788a2c730d6ae6dca0c6584b4462d566..a353a6f3be35cfde45a560005cbc9c6e60eed35e 100644 |
--- a/chrome/browser/chrome_browser_main_extra_parts_ash.cc |
+++ b/chrome/browser/chrome_browser_main_extra_parts_ash.cc |
@@ -6,10 +6,12 @@ |
#include "ash/accelerators/accelerator_controller.h" |
#include "ash/ash_switches.h" |
+#include "ash/high_contrast/high_contrast_controller.h" |
#include "ash/shell.h" |
#include "ash/wm/key_rewriter_event_filter.h" |
#include "ash/wm/property_util.h" |
#include "base/command_line.h" |
+#include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
#include "chrome/browser/lifetime/application_lifetime.h" |
#include "chrome/browser/ui/views/ash/caps_lock_handler.h" |
#include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
@@ -76,6 +78,9 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
shell->accelerator_controller()->SetVolumeControlDelegate( |
scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); |
+ ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( |
+ chromeos::accessibility::IsHighContrastEnabled()); |
+ |
if (!CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableZeroBrowsersOpenForTests)) { |
browser::StartKeepAlive(); |