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

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

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash (cleaning remaining wm_window.h in c/b/ui) Created 3 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
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/gpu_support_stub.h" 9 #include "ash/gpu_support_stub.h"
10 #include "ash/palette_delegate.h" 10 #include "ash/palette_delegate.h"
11 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
12 #include "ash/root_window_controller.h" 12 #include "ash/root_window_controller.h"
13 #include "ash/session/session_state_delegate.h" 13 #include "ash/session/session_state_delegate.h"
14 #include "ash/shelf/shelf.h" 14 #include "ash/shelf/shelf.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "ash/shell_observer.h" 16 #include "ash/shell_observer.h"
17 #include "ash/system/tray/system_tray_notifier.h" 17 #include "ash/system/tray/system_tray_notifier.h"
18 #include "ash/test/test_accessibility_delegate.h" 18 #include "ash/test/test_accessibility_delegate.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_system_tray_delegate.h" 21 #include "ash/test/test_system_tray_delegate.h"
22 #include "ash/test/test_wallpaper_delegate.h" 22 #include "ash/test/test_wallpaper_delegate.h"
23 #include "ash/wm/window_state.h" 23 #include "ash/wm/window_state.h"
24 #include "ash/wm/window_util.h" 24 #include "ash/wm/window_util.h"
25 #include "ash/wm_window.h"
26 #include "base/logging.h" 25 #include "base/logging.h"
27 #include "base/memory/ptr_util.h" 26 #include "base/memory/ptr_util.h"
28 #include "ui/aura/window.h" 27 #include "ui/aura/window.h"
29 #include "ui/gfx/image/image.h" 28 #include "ui/gfx/image/image.h"
30 29
31 namespace ash { 30 namespace ash {
32 namespace test { 31 namespace test {
33 32
34 // A ShellObserver that sets the shelf alignment and auto hide behavior when the 33 // A ShellObserver that sets the shelf alignment and auto hide behavior when the
35 // shelf is created, to simulate ChromeLauncherController's behavior. 34 // shelf is created, to simulate ChromeLauncherController's behavior.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, 159 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
161 bool use_local_state) { 160 bool use_local_state) {
162 if (use_local_state) 161 if (use_local_state)
163 touchscreen_enabled_in_local_pref_ = enabled; 162 touchscreen_enabled_in_local_pref_ = enabled;
164 } 163 }
165 164
166 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} 165 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
167 166
168 } // namespace test 167 } // namespace test
169 } // namespace ash 168 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698