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

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

Issue 187313002: Update StickyKeys overlay to show or hide AltGr depending on the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix rebase Created 6 years, 9 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 | Annotate | Revision Log
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/magnifier/partial_magnification_controller.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 14 #include "chrome/browser/browser_shutdown.h"
15 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
16 #include "chrome/browser/lifetime/application_lifetime.h" 15 #include "chrome/browser/lifetime/application_lifetime.h"
17 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 16 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
18 #include "chrome/browser/ui/ash/screenshot_taker.h" 17 #include "chrome/browser/ui/ash/screenshot_taker.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "ui/aura/env.h" 19 #include "ui/aura/env.h"
21 #include "ui/aura/window_tree_host.h" 20 #include "ui/aura/window_tree_host.h"
22 21
23 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
24 #include "base/sys_info.h" 23 #include "base/sys_info.h"
24 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
25 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
25 #include "chrome/browser/ui/ash/ime_controller_chromeos.h" 26 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
26 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 27 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
27 #include "chromeos/chromeos_switches.h" 28 #include "chromeos/chromeos_switches.h"
28 #include "chromeos/login/login_state.h" 29 #include "chromeos/login/login_state.h"
29 #include "ui/base/x/x11_util.h" 30 #include "ui/base/x/x11_util.h"
30 #endif 31 #endif
31 32
32 namespace chrome { 33 namespace chrome {
33 34
34 bool ShouldOpenAshOnStartup() { 35 bool ShouldOpenAshOnStartup() {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #endif 81 #endif
81 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show(); 82 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
82 } 83 }
83 84
84 void CloseAsh() { 85 void CloseAsh() {
85 if (ash::Shell::HasInstance()) 86 if (ash::Shell::HasInstance())
86 ash::Shell::DeleteInstance(); 87 ash::Shell::DeleteInstance();
87 } 88 }
88 89
89 } // namespace chrome 90 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/mock_input_method_manager.cc ('k') | chromeos/ime/fake_xkeyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698