Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 2086143002: Convert TrayEventFilter to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweak Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "ash/common/default_accessibility_delegate.h" 11 #include "ash/common/default_accessibility_delegate.h"
12 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/shell_window_ids.h" 13 #include "ash/common/shell_window_ids.h"
14 #include "ash/common/wm/window_state.h" 14 #include "ash/common/wm/window_state.h"
15 #include "ash/container_delegate_aura.h"
16 #include "ash/gpu_support_stub.h" 15 #include "ash/gpu_support_stub.h"
17 #include "ash/media_delegate.h" 16 #include "ash/media_delegate.h"
18 #include "ash/new_window_delegate.h" 17 #include "ash/new_window_delegate.h"
19 #include "ash/pointer_watcher_delegate_aura.h" 18 #include "ash/pointer_watcher_delegate_aura.h"
20 #include "ash/shell.h" 19 #include "ash/shell.h"
21 #include "ash/test/test_keyboard_ui.h" 20 #include "ash/test/test_keyboard_ui.h"
22 #include "ash/test/test_session_state_delegate.h" 21 #include "ash/test/test_session_state_delegate.h"
23 #include "ash/test/test_shelf_delegate.h" 22 #include "ash/test/test_shelf_delegate.h"
24 #include "ash/test/test_system_tray_delegate.h" 23 #include "ash/test/test_system_tray_delegate.h"
25 #include "ash/test/test_user_wallpaper_delegate.h" 24 #include "ash/test/test_user_wallpaper_delegate.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 198 }
200 199
201 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { 200 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() {
202 return new NewWindowDelegateImpl; 201 return new NewWindowDelegateImpl;
203 } 202 }
204 203
205 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { 204 MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
206 return new MediaDelegateImpl; 205 return new MediaDelegateImpl;
207 } 206 }
208 207
209 std::unique_ptr<ash::ContainerDelegate>
210 TestShellDelegate::CreateContainerDelegate() {
211 return base::WrapUnique(new ContainerDelegateAura);
212 }
213
214 std::unique_ptr<PointerWatcherDelegate> 208 std::unique_ptr<PointerWatcherDelegate>
215 TestShellDelegate::CreatePointerWatcherDelegate() { 209 TestShellDelegate::CreatePointerWatcherDelegate() {
216 return base::WrapUnique(new PointerWatcherDelegateAura); 210 return base::WrapUnique(new PointerWatcherDelegateAura);
217 } 211 }
218 212
219 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf, 213 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf,
220 const ShelfItem* item) { 214 const ShelfItem* item) {
221 return nullptr; 215 return nullptr;
222 } 216 }
223 217
(...skipping 14 matching lines...) Expand all
238 #if defined(OS_CHROMEOS) 232 #if defined(OS_CHROMEOS)
239 Shell* shell = Shell::GetInstance(); 233 Shell* shell = Shell::GetInstance();
240 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 234 static_cast<MediaDelegateImpl*>(shell->media_delegate())
241 ->set_media_capture_state(state); 235 ->set_media_capture_state(state);
242 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 236 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
243 #endif 237 #endif
244 } 238 }
245 239
246 } // namespace test 240 } // namespace test
247 } // namespace ash 241 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698