OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/test/test_shell_delegate.h" | 5 #include "ash/test/test_shell_delegate.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "ash/default_accessibility_delegate.h" | 9 #include "ash/default_accessibility_delegate.h" |
10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 namespace test { | 35 namespace test { |
36 namespace { | 36 namespace { |
37 | 37 |
38 class NewWindowDelegateImpl : public NewWindowDelegate { | 38 class NewWindowDelegateImpl : public NewWindowDelegate { |
39 public: | 39 public: |
40 NewWindowDelegateImpl() {} | 40 NewWindowDelegateImpl() {} |
41 virtual ~NewWindowDelegateImpl() {} | 41 virtual ~NewWindowDelegateImpl() {} |
42 | 42 |
43 private: | 43 private: |
44 // NewWindowDelegate: | 44 // NewWindowDelegate: |
45 virtual void NewTab() OVERRIDE {} | 45 virtual void NewTab() override {} |
46 virtual void NewWindow(bool incognito) OVERRIDE {} | 46 virtual void NewWindow(bool incognito) override {} |
47 virtual void OpenFileManager() OVERRIDE {} | 47 virtual void OpenFileManager() override {} |
48 virtual void OpenCrosh() OVERRIDE {} | 48 virtual void OpenCrosh() override {} |
49 virtual void RestoreTab() OVERRIDE {} | 49 virtual void RestoreTab() override {} |
50 virtual void ShowKeyboardOverlay() OVERRIDE {} | 50 virtual void ShowKeyboardOverlay() override {} |
51 virtual void ShowTaskManager() OVERRIDE {} | 51 virtual void ShowTaskManager() override {} |
52 virtual void OpenFeedbackPage() OVERRIDE {} | 52 virtual void OpenFeedbackPage() override {} |
53 | 53 |
54 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); | 54 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); |
55 }; | 55 }; |
56 | 56 |
57 class MediaDelegateImpl : public MediaDelegate { | 57 class MediaDelegateImpl : public MediaDelegate { |
58 public: | 58 public: |
59 MediaDelegateImpl() : state_(MEDIA_CAPTURE_NONE) {} | 59 MediaDelegateImpl() : state_(MEDIA_CAPTURE_NONE) {} |
60 virtual ~MediaDelegateImpl() {} | 60 virtual ~MediaDelegateImpl() {} |
61 | 61 |
62 void set_media_capture_state(MediaCaptureState state) { state_ = state; } | 62 void set_media_capture_state(MediaCaptureState state) { state_ = state; } |
63 | 63 |
64 private: | 64 private: |
65 // MediaDelegate: | 65 // MediaDelegate: |
66 virtual void HandleMediaNextTrack() OVERRIDE {} | 66 virtual void HandleMediaNextTrack() override {} |
67 virtual void HandleMediaPlayPause() OVERRIDE {} | 67 virtual void HandleMediaPlayPause() override {} |
68 virtual void HandleMediaPrevTrack() OVERRIDE {} | 68 virtual void HandleMediaPrevTrack() override {} |
69 virtual MediaCaptureState GetMediaCaptureState( | 69 virtual MediaCaptureState GetMediaCaptureState( |
70 content::BrowserContext* context) OVERRIDE { | 70 content::BrowserContext* context) override { |
71 return state_; | 71 return state_; |
72 } | 72 } |
73 | 73 |
74 MediaCaptureState state_; | 74 MediaCaptureState state_; |
75 | 75 |
76 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); | 76 DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl); |
77 }; | 77 }; |
78 | 78 |
79 } // namespace | 79 } // namespace |
80 | 80 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 #if defined(OS_CHROMEOS) | 199 #if defined(OS_CHROMEOS) |
200 Shell* shell = Shell::GetInstance(); | 200 Shell* shell = Shell::GetInstance(); |
201 static_cast<MediaDelegateImpl*>(shell->media_delegate()) | 201 static_cast<MediaDelegateImpl*>(shell->media_delegate()) |
202 ->set_media_capture_state(state); | 202 ->set_media_capture_state(state); |
203 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); | 203 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); |
204 #endif | 204 #endif |
205 } | 205 } |
206 | 206 |
207 } // namespace test | 207 } // namespace test |
208 } // namespace ash | 208 } // namespace ash |
OLD | NEW |