OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/accelerators/magnifier_key_scroller.h" | 7 #include "ash/accelerators/magnifier_key_scroller.h" |
8 #include "ash/accelerators/spoken_feedback_toggler.h" | 8 #include "ash/accelerators/spoken_feedback_toggler.h" |
9 #include "ash/accessibility_delegate.h" | 9 #include "ash/accessibility_delegate.h" |
10 #include "ash/wm/mru_window_tracker.h" | 10 #include "ash/wm/mru_window_tracker.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" | 25 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" |
26 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h" | 26 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h" |
27 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" | 27 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" |
28 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" | 28 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" |
29 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 29 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
30 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
31 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
32 #include "chrome/browser/ui/browser_window.h" | 32 #include "chrome/browser/ui/browser_window.h" |
33 #include "chrome/grit/generated_resources.h" | 33 #include "chrome/grit/generated_resources.h" |
34 #include "chromeos/chromeos_switches.h" | 34 #include "chromeos/chromeos_switches.h" |
35 #include "chromeos/ime/input_method_manager.h" | |
36 #include "content/public/browser/notification_service.h" | 35 #include "content/public/browser/notification_service.h" |
37 #include "content/public/browser/user_metrics.h" | 36 #include "content/public/browser/user_metrics.h" |
38 #include "ui/aura/window.h" | 37 #include "ui/aura/window.h" |
| 38 #include "ui/base/ime/chromeos/input_method_manager.h" |
39 #include "ui/base/l10n/l10n_util.h" | 39 #include "ui/base/l10n/l10n_util.h" |
40 | 40 |
41 #if !defined(USE_ATHENA) | 41 #if !defined(USE_ATHENA) |
42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 42 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
43 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" | 43 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" |
44 #endif | 44 #endif |
45 | 45 |
46 namespace { | 46 namespace { |
47 | 47 |
48 void InitAfterSessionStart() { | 48 void InitAfterSessionStart() { |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 } | 292 } |
293 | 293 |
294 void ChromeShellDelegate::PlatformInit() { | 294 void ChromeShellDelegate::PlatformInit() { |
295 registrar_.Add(this, | 295 registrar_.Add(this, |
296 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 296 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
297 content::NotificationService::AllSources()); | 297 content::NotificationService::AllSources()); |
298 registrar_.Add(this, | 298 registrar_.Add(this, |
299 chrome::NOTIFICATION_SESSION_STARTED, | 299 chrome::NOTIFICATION_SESSION_STARTED, |
300 content::NotificationService::AllSources()); | 300 content::NotificationService::AllSources()); |
301 } | 301 } |
OLD | NEW |