| 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/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" | |
| 14 #include "ash/shelf/shelf.h" | 13 #include "ash/shelf/shelf.h" |
| 15 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 16 #include "ash/shell_observer.h" | 15 #include "ash/shell_observer.h" |
| 17 #include "ash/system/tray/system_tray_notifier.h" | 16 #include "ash/system/tray/system_tray_notifier.h" |
| 18 #include "ash/test/test_accessibility_delegate.h" | 17 #include "ash/test/test_accessibility_delegate.h" |
| 19 #include "ash/test/test_keyboard_ui.h" | 18 #include "ash/test/test_keyboard_ui.h" |
| 20 #include "ash/test/test_session_state_delegate.h" | |
| 21 #include "ash/test/test_system_tray_delegate.h" | 19 #include "ash/test/test_system_tray_delegate.h" |
| 22 #include "ash/test/test_wallpaper_delegate.h" | 20 #include "ash/test/test_wallpaper_delegate.h" |
| 23 #include "ash/wm/window_state.h" | 21 #include "ash/wm/window_state.h" |
| 24 #include "ash/wm/window_util.h" | 22 #include "ash/wm/window_util.h" |
| 25 #include "ash/wm_window.h" | 23 #include "ash/wm_window.h" |
| 26 #include "base/logging.h" | 24 #include "base/logging.h" |
| 27 #include "base/memory/ptr_util.h" | 25 #include "base/memory/ptr_util.h" |
| 28 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
| 29 #include "ui/gfx/image/image.h" | 27 #include "ui/gfx/image/image.h" |
| 30 | 28 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 109 |
| 112 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { | 110 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { |
| 113 return new TestSystemTrayDelegate; | 111 return new TestSystemTrayDelegate; |
| 114 } | 112 } |
| 115 | 113 |
| 116 std::unique_ptr<WallpaperDelegate> | 114 std::unique_ptr<WallpaperDelegate> |
| 117 TestShellDelegate::CreateWallpaperDelegate() { | 115 TestShellDelegate::CreateWallpaperDelegate() { |
| 118 return base::MakeUnique<TestWallpaperDelegate>(); | 116 return base::MakeUnique<TestWallpaperDelegate>(); |
| 119 } | 117 } |
| 120 | 118 |
| 121 TestSessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() { | |
| 122 return new TestSessionStateDelegate(); | |
| 123 } | |
| 124 | |
| 125 AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() { | 119 AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() { |
| 126 return new TestAccessibilityDelegate(); | 120 return new TestAccessibilityDelegate(); |
| 127 } | 121 } |
| 128 | 122 |
| 129 std::unique_ptr<PaletteDelegate> TestShellDelegate::CreatePaletteDelegate() { | 123 std::unique_ptr<PaletteDelegate> TestShellDelegate::CreatePaletteDelegate() { |
| 130 return nullptr; | 124 return nullptr; |
| 131 } | 125 } |
| 132 | 126 |
| 133 ui::MenuModel* TestShellDelegate::CreateContextMenu(Shelf* shelf, | 127 ui::MenuModel* TestShellDelegate::CreateContextMenu(Shelf* shelf, |
| 134 const ShelfItem* item) { | 128 const ShelfItem* item) { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 160 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, | 154 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled, |
| 161 bool use_local_state) { | 155 bool use_local_state) { |
| 162 if (use_local_state) | 156 if (use_local_state) |
| 163 touchscreen_enabled_in_local_pref_ = enabled; | 157 touchscreen_enabled_in_local_pref_ = enabled; |
| 164 } | 158 } |
| 165 | 159 |
| 166 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} | 160 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {} |
| 167 | 161 |
| 168 } // namespace test | 162 } // namespace test |
| 169 } // namespace ash | 163 } // namespace ash |
| OLD | NEW |