| 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/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
| 6 | 6 |
| 7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
| 8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
| 9 #include "ash/default_wallpaper_delegate.h" | 9 #include "ash/default_wallpaper_delegate.h" |
| 10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
| 11 #include "ash/palette_delegate.h" | 11 #include "ash/palette_delegate.h" |
| 12 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
| 13 #include "ash/session/session_state_delegate.h" | 13 #include "ash/session/session_state_delegate.h" |
| 14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 15 #include "ash/shell/context_menu.h" | 15 #include "ash/shell/context_menu.h" |
| 16 #include "ash/shell/example_factory.h" | 16 #include "ash/shell/example_factory.h" |
| 17 #include "ash/shell/toplevel_window.h" | 17 #include "ash/shell/toplevel_window.h" |
| 18 #include "ash/system/tray/default_system_tray_delegate.h" | 18 #include "ash/system/tray/default_system_tray_delegate.h" |
| 19 #include "ash/test/test_keyboard_ui.h" | 19 #include "ash/test/test_keyboard_ui.h" |
| 20 #include "ash/test/test_shelf_delegate.h" | |
| 21 #include "ash/wm/window_state.h" | 20 #include "ash/wm/window_state.h" |
| 22 #include "base/memory/ptr_util.h" | 21 #include "base/memory/ptr_util.h" |
| 23 #include "base/message_loop/message_loop.h" | 22 #include "base/message_loop/message_loop.h" |
| 24 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
| 25 #include "components/user_manager/user_info_impl.h" | 24 #include "components/user_manager/user_info_impl.h" |
| 26 #include "ui/aura/window.h" | 25 #include "ui/aura/window.h" |
| 27 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
| 28 #include "ui/gfx/image/image_skia.h" | 27 #include "ui/gfx/image/image_skia.h" |
| 29 | 28 |
| 30 namespace ash { | 29 namespace ash { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 void ShellDelegateImpl::Exit() { | 114 void ShellDelegateImpl::Exit() { |
| 116 base::MessageLoop::current()->QuitWhenIdle(); | 115 base::MessageLoop::current()->QuitWhenIdle(); |
| 117 } | 116 } |
| 118 | 117 |
| 119 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { | 118 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { |
| 120 return new TestKeyboardUI; | 119 return new TestKeyboardUI; |
| 121 } | 120 } |
| 122 | 121 |
| 123 void ShellDelegateImpl::OpenUrlFromArc(const GURL& url) {} | 122 void ShellDelegateImpl::OpenUrlFromArc(const GURL& url) {} |
| 124 | 123 |
| 125 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { | |
| 126 return new test::TestShelfDelegate(); | |
| 127 } | |
| 128 | |
| 129 SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { | 124 SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { |
| 130 return new DefaultSystemTrayDelegate; | 125 return new DefaultSystemTrayDelegate; |
| 131 } | 126 } |
| 132 | 127 |
| 133 std::unique_ptr<WallpaperDelegate> | 128 std::unique_ptr<WallpaperDelegate> |
| 134 ShellDelegateImpl::CreateWallpaperDelegate() { | 129 ShellDelegateImpl::CreateWallpaperDelegate() { |
| 135 return base::MakeUnique<DefaultWallpaperDelegate>(); | 130 return base::MakeUnique<DefaultWallpaperDelegate>(); |
| 136 } | 131 } |
| 137 | 132 |
| 138 SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { | 133 SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 return true; | 165 return true; |
| 171 } | 166 } |
| 172 | 167 |
| 173 void ShellDelegateImpl::SetTouchscreenEnabledInPrefs(bool enabled, | 168 void ShellDelegateImpl::SetTouchscreenEnabledInPrefs(bool enabled, |
| 174 bool use_local_state) {} | 169 bool use_local_state) {} |
| 175 | 170 |
| 176 void ShellDelegateImpl::UpdateTouchscreenStatusFromPrefs() {} | 171 void ShellDelegateImpl::UpdateTouchscreenStatusFromPrefs() {} |
| 177 | 172 |
| 178 } // namespace shell | 173 } // namespace shell |
| 179 } // namespace ash | 174 } // namespace ash |
| OLD | NEW |