Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: chrome/browser/ui/ash/ash_init.cc

Issue 10915140: Add the partial screen magnifier to Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix preferences. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 scoped_ptr<ash::BrightnessControlDelegate>( 78 scoped_ptr<ash::BrightnessControlDelegate>(
78 new BrightnessController).Pass()); 79 new BrightnessController).Pass());
79 shell->accelerator_controller()->SetImeControlDelegate( 80 shell->accelerator_controller()->SetImeControlDelegate(
80 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass()); 81 scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
81 shell->accelerator_controller()->SetKeyboardBrightnessControlDelegate( 82 shell->accelerator_controller()->SetKeyboardBrightnessControlDelegate(
82 scoped_ptr<ash::KeyboardBrightnessControlDelegate>( 83 scoped_ptr<ash::KeyboardBrightnessControlDelegate>(
83 new KeyboardBrightnessController).Pass()); 84 new KeyboardBrightnessController).Pass());
84 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( 85 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
85 chromeos::accessibility::IsHighContrastEnabled()); 86 chromeos::accessibility::IsHighContrastEnabled());
86 87
88 chromeos::accessibility::ScreenMagnifierType magnifier_type =
89 chromeos::accessibility::GetScreenMagnifierType();
87 ash::Shell::GetInstance()->magnification_controller()->SetEnabled( 90 ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
88 chromeos::accessibility::IsScreenMagnifierEnabled()); 91 magnifier_type == chromeos::accessibility::MagnifierFull);
92 ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
93 magnifier_type == chromeos::accessibility::MagnifierPartial);
89 94
90 if (!CommandLine::ForCurrentProcess()->HasSwitch( 95 if (!CommandLine::ForCurrentProcess()->HasSwitch(
91 switches::kDisableZeroBrowsersOpenForTests)) { 96 switches::kDisableZeroBrowsersOpenForTests)) {
92 browser::StartKeepAlive(); 97 browser::StartKeepAlive();
93 } 98 }
94 #endif 99 #endif
95 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); 100 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
96 } 101 }
97 102
98 void CloseAsh() { 103 void CloseAsh() {
99 if (ash::Shell::GetInstance()) 104 if (ash::Shell::GetInstance())
100 ash::Shell::DeleteInstance(); 105 ash::Shell::DeleteInstance();
101 } 106 }
102 107
103 } // namespace chrome 108 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698