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/magnifier/magnifier_constants.h" | |
11 #include "ash/media_delegate.h" | 10 #include "ash/media_delegate.h" |
12 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
13 #include "base/command_line.h" | 12 #include "base/command_line.h" |
14 #include "chrome/browser/accessibility/accessibility_events.h" | 13 #include "chrome/browser/accessibility/accessibility_events.h" |
15 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
17 #include "chrome/browser/prefs/session_startup_pref.h" | 16 #include "chrome/browser/prefs/session_startup_pref.h" |
18 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/profiles/profile_manager.h" | 18 #include "chrome/browser/profiles/profile_manager.h" |
20 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" | 19 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" |
21 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" | 20 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" |
22 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" | 21 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" |
23 #include "chrome/browser/ui/ash/session_state_delegate_views.h" | 22 #include "chrome/browser/ui/ash/session_state_delegate_views.h" |
24 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" | 23 #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" |
25 #include "chrome/browser/ui/ash/system_tray_delegate_common.h" | 24 #include "chrome/browser/ui/ash/system_tray_delegate_common.h" |
26 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
27 #include "chrome/browser/ui/browser_finder.h" | 26 #include "chrome/browser/ui/browser_finder.h" |
28 #include "chrome/browser/ui/browser_list.h" | 27 #include "chrome/browser/ui/browser_list.h" |
29 #include "chrome/browser/ui/browser_tabstrip.h" | 28 #include "chrome/browser/ui/browser_tabstrip.h" |
30 #include "chrome/browser/ui/browser_window.h" | 29 #include "chrome/browser/ui/browser_window.h" |
31 #include "chrome/browser/ui/host_desktop.h" | 30 #include "chrome/browser/ui/host_desktop.h" |
32 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 31 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
33 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 32 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
34 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
35 #include "content/public/browser/notification_service.h" | 34 #include "content/public/browser/notification_service.h" |
| 35 #include "ui/chromeos/accessibility_types.h" |
36 | 36 |
37 namespace { | 37 namespace { |
38 | 38 |
39 class NewWindowDelegateImpl : public ChromeNewWindowDelegate { | 39 class NewWindowDelegateImpl : public ChromeNewWindowDelegate { |
40 public: | 40 public: |
41 NewWindowDelegateImpl() {} | 41 NewWindowDelegateImpl() {} |
42 virtual ~NewWindowDelegateImpl() {} | 42 virtual ~NewWindowDelegateImpl() {} |
43 | 43 |
44 // Overridden from ash::NewWindowDelegate: | 44 // Overridden from ash::NewWindowDelegate: |
45 virtual void OpenFileManager() override {} | 45 virtual void OpenFileManager() override {} |
(...skipping 30 matching lines...) Expand all Loading... |
76 | 76 |
77 virtual bool IsHighContrastEnabled() const override { | 77 virtual bool IsHighContrastEnabled() const override { |
78 return false; | 78 return false; |
79 } | 79 } |
80 | 80 |
81 virtual bool IsSpokenFeedbackEnabled() const override { | 81 virtual bool IsSpokenFeedbackEnabled() const override { |
82 return false; | 82 return false; |
83 } | 83 } |
84 | 84 |
85 virtual void ToggleSpokenFeedback( | 85 virtual void ToggleSpokenFeedback( |
86 ash::AccessibilityNotificationVisibility notify) override { | 86 ui::AccessibilityNotificationVisibility notify) override { |
87 } | 87 } |
88 | 88 |
89 virtual void SetLargeCursorEnabled(bool enalbed) override { | 89 virtual void SetLargeCursorEnabled(bool enalbed) override { |
90 } | 90 } |
91 | 91 |
92 virtual bool IsLargeCursorEnabled() const override { | 92 virtual bool IsLargeCursorEnabled() const override { |
93 return false; | 93 return false; |
94 } | 94 } |
95 | 95 |
96 virtual void SetMagnifierEnabled(bool enabled) override { | 96 virtual void SetMagnifierEnabled(bool enabled) override { |
97 } | 97 } |
98 | 98 |
99 virtual void SetMagnifierType(ash::MagnifierType type) override { | 99 virtual void SetMagnifierType(ui::MagnifierType type) override { |
100 } | 100 } |
101 | 101 |
102 virtual bool IsMagnifierEnabled() const override { | 102 virtual bool IsMagnifierEnabled() const override { |
103 return false; | 103 return false; |
104 } | 104 } |
105 | 105 |
106 virtual void SetAutoclickEnabled(bool enabled) override { | 106 virtual void SetAutoclickEnabled(bool enabled) override { |
107 } | 107 } |
108 | 108 |
109 virtual bool IsAutoclickEnabled() const override { | 109 virtual bool IsAutoclickEnabled() const override { |
110 return false; | 110 return false; |
111 } | 111 } |
112 | 112 |
113 virtual ash::MagnifierType GetMagnifierType() const override { | 113 virtual ui::MagnifierType GetMagnifierType() const override { |
114 return ash::kDefaultMagnifierType; | 114 return ui::kDefaultMagnifierType; |
115 } | 115 } |
116 | 116 |
117 virtual void SaveScreenMagnifierScale(double scale) override { | 117 virtual void SaveScreenMagnifierScale(double scale) override { |
118 } | 118 } |
119 | 119 |
120 virtual double GetSavedScreenMagnifierScale() override { | 120 virtual double GetSavedScreenMagnifierScale() override { |
121 return std::numeric_limits<double>::min(); | 121 return std::numeric_limits<double>::min(); |
122 } | 122 } |
123 | 123 |
124 virtual bool ShouldShowAccessibilityMenu() const override { | 124 virtual bool ShouldShowAccessibilityMenu() const override { |
125 return false; | 125 return false; |
126 } | 126 } |
127 | 127 |
128 virtual bool IsBrailleDisplayConnected() const override { return false; } | 128 virtual bool IsBrailleDisplayConnected() const override { return false; } |
129 | 129 |
130 virtual void SilenceSpokenFeedback() const override { | 130 virtual void SilenceSpokenFeedback() const override { |
131 } | 131 } |
132 | 132 |
133 virtual void SetVirtualKeyboardEnabled(bool enabled) override { | 133 virtual void SetVirtualKeyboardEnabled(bool enabled) override { |
134 } | 134 } |
135 | 135 |
136 virtual bool IsVirtualKeyboardEnabled() const override { | 136 virtual bool IsVirtualKeyboardEnabled() const override { |
137 return false; | 137 return false; |
138 } | 138 } |
139 | 139 |
140 virtual void TriggerAccessibilityAlert( | 140 virtual void TriggerAccessibilityAlert( |
141 ash::AccessibilityAlert alert) override { | 141 ui::AccessibilityAlert alert) override { |
142 } | 142 } |
143 | 143 |
144 virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override { | 144 virtual ui::AccessibilityAlert GetLastAccessibilityAlert() override { |
145 return ash::A11Y_ALERT_NONE; | 145 return ui::A11Y_ALERT_NONE; |
146 } | 146 } |
147 | 147 |
148 virtual void PlayEarcon(int sound_key) override { | 148 virtual void PlayEarcon(int sound_key) override { |
149 } | 149 } |
150 | 150 |
151 virtual base::TimeDelta PlayShutdownSound() const override { | 151 virtual base::TimeDelta PlayShutdownSound() const override { |
152 return base::TimeDelta(); | 152 return base::TimeDelta(); |
153 } | 153 } |
154 | 154 |
155 private: | 155 private: |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 chrome::NOTIFICATION_PROFILE_ADDED, | 270 chrome::NOTIFICATION_PROFILE_ADDED, |
271 content::NotificationService::AllSources()); | 271 content::NotificationService::AllSources()); |
272 registrar_.Add(this, | 272 registrar_.Add(this, |
273 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 273 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
274 content::NotificationService::AllSources()); | 274 content::NotificationService::AllSources()); |
275 registrar_.Add(this, | 275 registrar_.Add(this, |
276 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 276 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
277 content::NotificationService::AllSources()); | 277 content::NotificationService::AllSources()); |
278 #endif | 278 #endif |
279 } | 279 } |
OLD | NEW |