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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/accessibility_delegate.h" | 9 #include "ash/accessibility_delegate.h" |
10 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/prefs/session_startup_pref.h" | 15 #include "chrome/browser/prefs/session_startup_pref.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
18 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" | 18 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" |
19 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" | 19 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" |
20 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" | 20 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" |
21 #include "chrome/browser/ui/ash/session_state_delegate_views.h" | 21 #include "chrome/browser/ui/ash/session_state_delegate_views.h" |
22 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" | 22 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" |
23 #include "chrome/browser/ui/ash/system_tray_delegate_common.h" | 23 #include "chrome/browser/ui/ash/system_tray_delegate_common.h" |
24 #include "chrome/browser/ui/browser.h" | 24 #include "chrome/browser/ui/browser.h" |
25 #include "chrome/browser/ui/browser_finder.h" | 25 #include "chrome/browser/ui/browser_finder.h" |
26 #include "chrome/browser/ui/browser_list.h" | 26 #include "chrome/browser/ui/browser_list.h" |
27 #include "chrome/browser/ui/browser_tabstrip.h" | 27 #include "chrome/browser/ui/browser_tabstrip.h" |
28 #include "chrome/browser/ui/browser_window.h" | 28 #include "chrome/browser/ui/browser_window.h" |
29 #include "chrome/browser/ui/host_desktop.h" | |
30 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 29 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
31 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 30 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
32 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
33 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
34 #include "ui/chromeos/accessibility_types.h" | 33 #include "ui/chromeos/accessibility_types.h" |
| 34 #include "ui/gfx/host_desktop_type.h" |
35 | 35 |
36 namespace { | 36 namespace { |
37 | 37 |
38 class NewWindowDelegateImpl : public ChromeNewWindowDelegate { | 38 class NewWindowDelegateImpl : public ChromeNewWindowDelegate { |
39 public: | 39 public: |
40 NewWindowDelegateImpl() {} | 40 NewWindowDelegateImpl() {} |
41 ~NewWindowDelegateImpl() override {} | 41 ~NewWindowDelegateImpl() override {} |
42 | 42 |
43 // Overridden from ash::NewWindowDelegate: | 43 // Overridden from ash::NewWindowDelegate: |
44 void OpenFileManager() override {} | 44 void OpenFileManager() override {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 chrome::NOTIFICATION_PROFILE_ADDED, | 241 chrome::NOTIFICATION_PROFILE_ADDED, |
242 content::NotificationService::AllSources()); | 242 content::NotificationService::AllSources()); |
243 registrar_.Add(this, | 243 registrar_.Add(this, |
244 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 244 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
245 content::NotificationService::AllSources()); | 245 content::NotificationService::AllSources()); |
246 registrar_.Add(this, | 246 registrar_.Add(this, |
247 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 247 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
248 content::NotificationService::AllSources()); | 248 content::NotificationService::AllSources()); |
249 #endif | 249 #endif |
250 } | 250 } |
OLD | NEW |