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

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

Issue 2113023002: mash: Migrate MediaDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment. Created 4 years, 5 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/media_delegate_chromeos.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/media_delegate.h"
12 #include "ash/common/session/session_state_delegate.h" 13 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/shell_window_ids.h" 14 #include "ash/common/shell_window_ids.h"
14 #include "ash/common/wm/window_state.h" 15 #include "ash/common/wm/window_state.h"
15 #include "ash/common/wm_shell.h" 16 #include "ash/common/wm_shell.h"
16 #include "ash/gpu_support_stub.h" 17 #include "ash/gpu_support_stub.h"
17 #include "ash/media_delegate.h"
18 #include "ash/new_window_delegate.h" 18 #include "ash/new_window_delegate.h"
19 #include "ash/pointer_watcher_delegate_aura.h" 19 #include "ash/pointer_watcher_delegate_aura.h"
20 #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"
26 #include "ash/wm/window_util.h" 25 #include "ash/wm/window_util.h"
27 #include "base/logging.h" 26 #include "base/logging.h"
28 #include "base/memory/ptr_util.h" 27 #include "base/memory/ptr_util.h"
29 #include "ui/app_list/presenter/app_list_presenter_impl.h" 28 #include "ui/app_list/presenter/app_list_presenter_impl.h"
30 #include "ui/app_list/presenter/app_list_view_delegate_factory.h" 29 #include "ui/app_list/presenter/app_list_view_delegate_factory.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 base::string16 TestShellDelegate::GetProductName() const { 220 base::string16 TestShellDelegate::GetProductName() const {
222 return base::string16(); 221 return base::string16();
223 } 222 }
224 223
225 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const { 224 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
226 return gfx::Image(); 225 return gfx::Image();
227 } 226 }
228 227
229 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { 228 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
230 #if defined(OS_CHROMEOS) 229 #if defined(OS_CHROMEOS)
231 static_cast<MediaDelegateImpl*>(Shell::GetInstance()->media_delegate()) 230 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate())
232 ->set_media_capture_state(state); 231 ->set_media_capture_state(state);
233 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); 232 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();
234 #endif 233 #endif
235 } 234 }
236 235
237 } // namespace test 236 } // namespace test
238 } // namespace ash 237 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/media_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698