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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass()); | 77 scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass()); |
77 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
78 shell->accelerator_controller()->SetBrightnessControlDelegate( | 79 shell->accelerator_controller()->SetBrightnessControlDelegate( |
79 scoped_ptr<ash::BrightnessControlDelegate>( | 80 scoped_ptr<ash::BrightnessControlDelegate>( |
80 new BrightnessController).Pass()); | 81 new BrightnessController).Pass()); |
81 shell->accelerator_controller()->SetImeControlDelegate( | 82 shell->accelerator_controller()->SetImeControlDelegate( |
82 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); | 83 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); |
83 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( | 84 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( |
84 chromeos::accessibility::IsHighContrastEnabled()); | 85 chromeos::accessibility::IsHighContrastEnabled()); |
85 | 86 |
| 87 chromeos::accessibility::ScreenMagnifierType magnifier_type = |
| 88 chromeos::accessibility::GetScreenMagnifierType(); |
86 ash::Shell::GetInstance()->magnification_controller()->SetEnabled( | 89 ash::Shell::GetInstance()->magnification_controller()->SetEnabled( |
87 chromeos::accessibility::IsScreenMagnifierEnabled()); | 90 magnifier_type == chromeos::accessibility::MAGNIFIER_FULL); |
| 91 ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled( |
| 92 magnifier_type == chromeos::accessibility::MAGNIFIER_PARTIAL); |
88 | 93 |
89 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 94 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
90 switches::kDisableZeroBrowsersOpenForTests)) { | 95 switches::kDisableZeroBrowsersOpenForTests)) { |
91 browser::StartKeepAlive(); | 96 browser::StartKeepAlive(); |
92 } | 97 } |
93 #endif | 98 #endif |
94 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); | 99 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |
95 } | 100 } |
96 | 101 |
97 void CloseAsh() { | 102 void CloseAsh() { |
98 if (ash::Shell::HasInstance()) | 103 if (ash::Shell::HasInstance()) |
99 ash::Shell::DeleteInstance(); | 104 ash::Shell::DeleteInstance(); |
100 } | 105 } |
101 | 106 |
102 } // namespace chrome | 107 } // namespace chrome |
OLD | NEW |