| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/ash_init.h" | 5 #include "chrome/browser/ui/ash/ash_init.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
| 10 #include "ash/magnifier/magnification_controller.h" | 10 #include "ash/magnifier/magnification_controller.h" |
| 11 #include "ash/magnifier/partial_magnification_controller.h" |
| 11 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 12 #include "ash/wm/event_rewriter_event_filter.h" | 13 #include "ash/wm/event_rewriter_event_filter.h" |
| 13 #include "ash/wm/property_util.h" | 14 #include "ash/wm/property_util.h" |
| 14 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 15 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" | 16 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" |
| 16 #include "chrome/browser/lifetime/application_lifetime.h" | 17 #include "chrome/browser/lifetime/application_lifetime.h" |
| 17 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" | 18 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 18 #include "chrome/browser/ui/ash/event_rewriter.h" | 19 #include "chrome/browser/ui/ash/event_rewriter.h" |
| 19 #include "chrome/browser/ui/ash/screenshot_taker.h" | 20 #include "chrome/browser/ui/ash/screenshot_taker.h" |
| 20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass()); | 79 scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass()); |
| 79 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
| 80 shell->accelerator_controller()->SetBrightnessControlDelegate( | 81 shell->accelerator_controller()->SetBrightnessControlDelegate( |
| 81 scoped_ptr<ash::BrightnessControlDelegate>( | 82 scoped_ptr<ash::BrightnessControlDelegate>( |
| 82 new BrightnessController).Pass()); | 83 new BrightnessController).Pass()); |
| 83 shell->accelerator_controller()->SetImeControlDelegate( | 84 shell->accelerator_controller()->SetImeControlDelegate( |
| 84 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); | 85 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); |
| 85 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( | 86 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( |
| 86 chromeos::accessibility::IsHighContrastEnabled()); | 87 chromeos::accessibility::IsHighContrastEnabled()); |
| 87 | 88 |
| 89 chromeos::accessibility::ScreenMagnifierType magnifier_type = |
| 90 chromeos::accessibility::GetScreenMagnifierType(); |
| 88 ash::Shell::GetInstance()->magnification_controller()->SetEnabled( | 91 ash::Shell::GetInstance()->magnification_controller()->SetEnabled( |
| 89 chromeos::accessibility::IsScreenMagnifierEnabled()); | 92 magnifier_type == chromeos::accessibility::MagnifierFull); |
| 93 ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled( |
| 94 magnifier_type == chromeos::accessibility::MagnifierPartial); |
| 90 | 95 |
| 91 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 96 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 92 switches::kDisableZeroBrowsersOpenForTests)) { | 97 switches::kDisableZeroBrowsersOpenForTests)) { |
| 93 browser::StartKeepAlive(); | 98 browser::StartKeepAlive(); |
| 94 } | 99 } |
| 95 #endif | 100 #endif |
| 96 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); | 101 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |
| 97 } | 102 } |
| 98 | 103 |
| 99 void CloseAsh() { | 104 void CloseAsh() { |
| 100 if (ash::Shell::HasInstance()) | 105 if (ash::Shell::HasInstance()) |
| 101 ash::Shell::DeleteInstance(); | 106 ash::Shell::DeleteInstance(); |
| 102 } | 107 } |
| 103 | 108 |
| 104 } // namespace chrome | 109 } // namespace chrome |
| OLD | NEW |