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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "ash/magnifier/magnifier_constants.h" | 8 #include "ash/magnifier/magnifier_constants.h" |
9 #include "chrome/browser/prefs/session_startup_pref.h" | 9 #include "chrome/browser/prefs/session_startup_pref.h" |
10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
11 #include "chrome/browser/ui/ash/caps_lock_delegate_views.h" | 11 #include "chrome/browser/ui/ash/caps_lock_delegate_views.h" |
| 12 #include "chrome/browser/ui/ash/session_state_delegate_views.h" |
12 #include "chrome/browser/ui/ash/window_positioner.h" | 13 #include "chrome/browser/ui/ash/window_positioner.h" |
13 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
15 #include "chrome/browser/ui/browser_tabstrip.h" | 16 #include "chrome/browser/ui/browser_tabstrip.h" |
16 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/browser/ui/host_desktop.h" | 18 #include "chrome/browser/ui/host_desktop.h" |
18 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" | 19 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
19 #include "chrome/common/chrome_notification_types.h" | 20 #include "chrome/common/chrome_notification_types.h" |
20 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
21 | 22 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 } | 69 } |
69 | 70 |
70 ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const { | 71 ash::MagnifierType ChromeShellDelegate::GetMagnifierType() const { |
71 return ash::kDefaultMagnifierType; | 72 return ash::kDefaultMagnifierType; |
72 } | 73 } |
73 | 74 |
74 ash::CapsLockDelegate* ChromeShellDelegate::CreateCapsLockDelegate() { | 75 ash::CapsLockDelegate* ChromeShellDelegate::CreateCapsLockDelegate() { |
75 return new CapsLockDelegate(); | 76 return new CapsLockDelegate(); |
76 } | 77 } |
77 | 78 |
| 79 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { |
| 80 return new SessionStateDelegate; |
| 81 } |
| 82 |
78 void ChromeShellDelegate::SaveScreenMagnifierScale(double scale) { | 83 void ChromeShellDelegate::SaveScreenMagnifierScale(double scale) { |
79 } | 84 } |
80 | 85 |
81 double ChromeShellDelegate::GetSavedScreenMagnifierScale() { | 86 double ChromeShellDelegate::GetSavedScreenMagnifierScale() { |
82 return std::numeric_limits<double>::min(); | 87 return std::numeric_limits<double>::min(); |
83 } | 88 } |
84 | 89 |
85 bool ChromeShellDelegate::ShouldAlwaysShowAccessibilityMenu() const { | 90 bool ChromeShellDelegate::ShouldAlwaysShowAccessibilityMenu() const { |
86 return false; | 91 return false; |
87 } | 92 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 void ChromeShellDelegate::PlatformInit() { | 157 void ChromeShellDelegate::PlatformInit() { |
153 #if defined(OS_WIN) | 158 #if defined(OS_WIN) |
154 registrar_.Add(this, | 159 registrar_.Add(this, |
155 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 160 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
156 content::NotificationService::AllSources()); | 161 content::NotificationService::AllSources()); |
157 registrar_.Add(this, | 162 registrar_.Add(this, |
158 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 163 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
159 content::NotificationService::AllSources()); | 164 content::NotificationService::AllSources()); |
160 #endif | 165 #endif |
161 } | 166 } |
OLD | NEW |