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

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

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids
Patch Set: merge to trunk Created 4 years, 8 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
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/app_list/app_list_view_delegate_factory.h" 11 #include "ash/app_list/app_list_view_delegate_factory.h"
12 #include "ash/default_accessibility_delegate.h" 12 #include "ash/default_accessibility_delegate.h"
13 #include "ash/gpu_support_stub.h" 13 #include "ash/gpu_support_stub.h"
14 #include "ash/media_delegate.h" 14 #include "ash/media_delegate.h"
15 #include "ash/new_window_delegate.h" 15 #include "ash/new_window_delegate.h"
16 #include "ash/session/session_state_delegate.h" 16 #include "ash/session/session_state_delegate.h"
17 #include "ash/shell.h" 17 #include "ash/shell.h"
18 #include "ash/shell_window_ids.h" 18 #include "ash/shell_window_ids.h"
19 #include "ash/test/test_keyboard_ui.h" 19 #include "ash/test/test_keyboard_ui.h"
20 #include "ash/test/test_session_state_delegate.h" 20 #include "ash/test/test_session_state_delegate.h"
21 #include "ash/test/test_shelf_delegate.h" 21 #include "ash/test/test_shelf_delegate.h"
22 #include "ash/test/test_system_tray_delegate.h" 22 #include "ash/test/test_system_tray_delegate.h"
23 #include "ash/test/test_user_wallpaper_delegate.h" 23 #include "ash/test/test_user_wallpaper_delegate.h"
24 #include "ash/wm/window_state.h" 24 #include "ash/wm/common/window_state.h"
25 #include "ash/wm/window_util.h" 25 #include "ash/wm/window_util.h"
26 #include "base/logging.h" 26 #include "base/logging.h"
27 #include "base/memory/ptr_util.h" 27 #include "base/memory/ptr_util.h"
28 #include "ui/app_list/presenter/app_list_presenter_impl.h" 28 #include "ui/app_list/presenter/app_list_presenter_impl.h"
29 #include "ui/app_list/test/app_list_test_view_delegate.h" 29 #include "ui/app_list/test/app_list_test_view_delegate.h"
30 #include "ui/aura/window.h" 30 #include "ui/aura/window.h"
31 #include "ui/gfx/image/image.h" 31 #include "ui/gfx/image/image.h"
32 32
33 #if defined(OS_CHROMEOS) 33 #if defined(OS_CHROMEOS)
34 #include "ash/system/tray/system_tray_notifier.h" 34 #include "ash/system/tray/system_tray_notifier.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 #if defined(OS_CHROMEOS) 226 #if defined(OS_CHROMEOS)
227 Shell* shell = Shell::GetInstance(); 227 Shell* shell = Shell::GetInstance();
228 static_cast<MediaDelegateImpl*>(shell->media_delegate()) 228 static_cast<MediaDelegateImpl*>(shell->media_delegate())
229 ->set_media_capture_state(state); 229 ->set_media_capture_state(state);
230 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); 230 shell->system_tray_notifier()->NotifyMediaCaptureChanged();
231 #endif 231 #endif
232 } 232 }
233 233
234 } // namespace test 234 } // namespace test
235 } // namespace ash 235 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/wm/ash_focus_rules.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698