| 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" | 10 #include "ash/magnifier/magnifier_constants.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); | 54 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 class MediaDelegateImpl : public ash::MediaDelegate { | 57 class MediaDelegateImpl : public ash::MediaDelegate { |
| 58 public: | 58 public: |
| 59 MediaDelegateImpl() {} | 59 MediaDelegateImpl() {} |
| 60 virtual ~MediaDelegateImpl() {} | 60 virtual ~MediaDelegateImpl() {} |
| 61 virtual void HandleMediaNextTrack() OVERRIDE {} | 61 virtual void HandleMediaNextTrack() OVERRIDE {} |
| 62 virtual void HandleMediaPlayPause() OVERRIDE {} | 62 virtual void HandleMediaPlayPause() OVERRIDE {} |
| 63 virtual void HandleMediaPrevTrack() OVERRIDE {} | 63 virtual void HandleMediaPrevTrack() OVERRIDE {} |
| 64 virtual ash::MediaCaptureState GetMediaCaptureState( |
| 65 content::BrowserContext* context) OVERRIDE { |
| 66 return ash::MEDIA_CAPTURE_NONE; |
| 67 } |
| 64 | 68 |
| 65 private: | 69 private: |
| 66 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); | 70 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); |
| 67 }; | 71 }; |
| 68 | 72 |
| 69 class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate { | 73 class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate { |
| 70 public: | 74 public: |
| 71 EmptyAccessibilityDelegate() {} | 75 EmptyAccessibilityDelegate() {} |
| 72 virtual ~EmptyAccessibilityDelegate() {} | 76 virtual ~EmptyAccessibilityDelegate() {} |
| 73 | 77 |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 chrome::NOTIFICATION_PROFILE_ADDED, | 279 chrome::NOTIFICATION_PROFILE_ADDED, |
| 276 content::NotificationService::AllSources()); | 280 content::NotificationService::AllSources()); |
| 277 registrar_.Add(this, | 281 registrar_.Add(this, |
| 278 chrome::NOTIFICATION_ASH_SESSION_STARTED, | 282 chrome::NOTIFICATION_ASH_SESSION_STARTED, |
| 279 content::NotificationService::AllSources()); | 283 content::NotificationService::AllSources()); |
| 280 registrar_.Add(this, | 284 registrar_.Add(this, |
| 281 chrome::NOTIFICATION_ASH_SESSION_ENDED, | 285 chrome::NOTIFICATION_ASH_SESSION_ENDED, |
| 282 content::NotificationService::AllSources()); | 286 content::NotificationService::AllSources()); |
| 283 #endif | 287 #endif |
| 284 } | 288 } |
| OLD | NEW |