| 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 } | 179 } |
| 180 | 180 |
| 181 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 181 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { |
| 182 return new NewWindowDelegateImpl; | 182 return new NewWindowDelegateImpl; |
| 183 } | 183 } |
| 184 | 184 |
| 185 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 185 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { |
| 186 return new MediaDelegateImpl; | 186 return new MediaDelegateImpl; |
| 187 } | 187 } |
| 188 | 188 |
| 189 PaletteDelegate* TestShellDelegate::CreatePaletteDelegate() { |
| 190 return nullptr; |
| 191 } |
| 192 |
| 189 std::unique_ptr<PointerWatcherDelegate> | 193 std::unique_ptr<PointerWatcherDelegate> |
| 190 TestShellDelegate::CreatePointerWatcherDelegate() { | 194 TestShellDelegate::CreatePointerWatcherDelegate() { |
| 191 return base::WrapUnique(new PointerWatcherDelegateAura); | 195 return base::WrapUnique(new PointerWatcherDelegateAura); |
| 192 } | 196 } |
| 193 | 197 |
| 194 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf, | 198 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf, |
| 195 const ShelfItem* item) { | 199 const ShelfItem* item) { |
| 196 return nullptr; | 200 return nullptr; |
| 197 } | 201 } |
| 198 | 202 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 216 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 213 #if defined(OS_CHROMEOS) | 217 #if defined(OS_CHROMEOS) |
| 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 218 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 215 ->set_media_capture_state(state); | 219 ->set_media_capture_state(state); |
| 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 220 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 217 #endif | 221 #endif |
| 218 } | 222 } |
| 219 | 223 |
| 220 } // namespace test | 224 } // namespace test |
| 221 } // namespace ash | 225 } // namespace ash |
| OLD | NEW |