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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/browser_shutdown.h" 14 #include "chrome/browser/browser_shutdown.h"
15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 15 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
16 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 16 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
17 #include "chrome/browser/lifetime/application_lifetime.h" 17 #include "chrome/browser/lifetime/application_lifetime.h"
18 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" 18 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
19 #include "chrome/browser/ui/ash/screenshot_taker.h" 19 #include "chrome/browser/ui/ash/screenshot_taker.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "ui/aura/env.h" 21 #include "ui/aura/env.h"
22 #include "ui/aura/root_window.h" 22 #include "ui/aura/window_event_dispatcher.h"
23 23
24 #if defined(OS_CHROMEOS) 24 #if defined(OS_CHROMEOS)
25 #include "base/sys_info.h" 25 #include "base/sys_info.h"
26 #include "chrome/browser/ui/ash/ime_controller_chromeos.h" 26 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
27 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" 27 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
28 #include "chromeos/chromeos_switches.h" 28 #include "chromeos/chromeos_switches.h"
29 #include "chromeos/login/login_state.h" 29 #include "chromeos/login/login_state.h"
30 #include "ui/base/x/x11_util.h" 30 #include "ui/base/x/x11_util.h"
31 #endif 31 #endif
32 32
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void CloseAsh() { 85 void CloseAsh() {
86 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't 86 // If shutdown is initiated by |BrowserX11IOErrorHandler|, don't
87 // try to cleanup resources. 87 // try to cleanup resources.
88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() && 88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
89 ash::Shell::HasInstance()) { 89 ash::Shell::HasInstance()) {
90 ash::Shell::DeleteInstance(); 90 ash::Shell::DeleteInstance();
91 } 91 }
92 } 92 }
93 93
94 } // namespace chrome 94 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698