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/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/magnifier/magnifier_constants.h" | 8 #include "ash/magnifier/magnifier_constants.h" |
9 #include "ash/media_delegate.h" | 9 #include "ash/media_delegate.h" |
10 #include "ash/system/tray/default_system_tray_delegate.h" | 10 #include "ash/system/tray/default_system_tray_delegate.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 149 |
150 } // namespace | 150 } // namespace |
151 | 151 |
152 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { | 152 bool ChromeShellDelegate::IsFirstRunAfterBoot() const { |
153 return false; | 153 return false; |
154 } | 154 } |
155 | 155 |
156 void ChromeShellDelegate::PreInit() { | 156 void ChromeShellDelegate::PreInit() { |
157 } | 157 } |
158 | 158 |
159 void ChromeShellDelegate::Shutdown() { | 159 void ChromeShellDelegate::PreShutdown() { |
160 } | 160 } |
161 | 161 |
162 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { | 162 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { |
163 return new NewWindowDelegateImpl; | 163 return new NewWindowDelegateImpl; |
164 } | 164 } |
165 | 165 |
166 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { | 166 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { |
167 return new MediaDelegateImpl; | 167 return new MediaDelegateImpl; |
168 } | 168 } |
169 | 169 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 void ChromeShellDelegate::PlatformInit() { | 254 void ChromeShellDelegate::PlatformInit() { |
255 #if defined(OS_WIN) | 255 #if defined(OS_WIN) |
256 registrar_.Add(this, | 256 registrar_.Add(this, |
257 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 257 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
258 content::NotificationService::AllSources()); | 258 content::NotificationService::AllSources()); |
259 registrar_.Add(this, | 259 registrar_.Add(this, |
260 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 260 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
261 content::NotificationService::AllSources()); | 261 content::NotificationService::AllSources()); |
262 #endif | 262 #endif |
263 } | 263 } |
OLD | NEW |