| 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/app_list/app_list_presenter_delegate.h" | 9 #include "ash/app_list/app_list_presenter_delegate.h" |
| 10 #include "ash/app_list/app_list_presenter_delegate_factory.h" | 10 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // NewWindowDelegate: | 48 // NewWindowDelegate: |
| 49 void NewTab() override {} | 49 void NewTab() override {} |
| 50 void NewWindow(bool incognito) override {} | 50 void NewWindow(bool incognito) override {} |
| 51 void OpenFileManager() override {} | 51 void OpenFileManager() override {} |
| 52 void OpenCrosh() override {} | 52 void OpenCrosh() override {} |
| 53 void OpenGetHelp() override {} | 53 void OpenGetHelp() override {} |
| 54 void RestoreTab() override {} | 54 void RestoreTab() override {} |
| 55 void ShowKeyboardOverlay() override {} | 55 void ShowKeyboardOverlay() override {} |
| 56 void ShowTaskManager() override {} | 56 void ShowTaskManager() override {} |
| 57 void OpenFeedbackPage() override {} | 57 void OpenFeedbackPage() override {} |
| 58 void OpenNetworkDiag() override {} |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); | 60 DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 class MediaDelegateImpl : public MediaDelegate { | 63 class MediaDelegateImpl : public MediaDelegate { |
| 63 public: | 64 public: |
| 64 MediaDelegateImpl() : state_(MEDIA_CAPTURE_NONE) {} | 65 MediaDelegateImpl() : state_(MEDIA_CAPTURE_NONE) {} |
| 65 ~MediaDelegateImpl() override {} | 66 ~MediaDelegateImpl() override {} |
| 66 | 67 |
| 67 void set_media_capture_state(MediaCaptureState state) { state_ = state; } | 68 void set_media_capture_state(MediaCaptureState state) { state_ = state; } |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 213 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 213 #if defined(OS_CHROMEOS) | 214 #if defined(OS_CHROMEOS) |
| 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 215 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 215 ->set_media_capture_state(state); | 216 ->set_media_capture_state(state); |
| 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 217 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 217 #endif | 218 #endif |
| 218 } | 219 } |
| 219 | 220 |
| 220 } // namespace test | 221 } // namespace test |
| 221 } // namespace ash | 222 } // namespace ash |
| OLD | NEW |