| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/mus/shell_delegate_mus.h" | 5 #include "ash/mus/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/gpu_support_stub.h" | 9 #include "ash/gpu_support_stub.h" |
| 10 #include "ash/mus/accessibility_delegate_mus.h" | 10 #include "ash/mus/accessibility_delegate_mus.h" |
| 11 #include "ash/mus/context_menu_mus.h" | 11 #include "ash/mus/context_menu_mus.h" |
| 12 #include "ash/mus/shelf_delegate_mus.h" | |
| 13 #include "ash/mus/system_tray_delegate_mus.h" | 12 #include "ash/mus/system_tray_delegate_mus.h" |
| 14 #include "ash/mus/wallpaper_delegate_mus.h" | 13 #include "ash/mus/wallpaper_delegate_mus.h" |
| 15 #include "ash/palette_delegate.h" | 14 #include "ash/palette_delegate.h" |
| 16 #include "ash/session/session_state_delegate.h" | 15 #include "ash/session/session_state_delegate.h" |
| 17 #include "base/memory/ptr_util.h" | 16 #include "base/memory/ptr_util.h" |
| 18 #include "base/strings/string16.h" | 17 #include "base/strings/string16.h" |
| 19 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
| 20 #include "components/user_manager/user_info_impl.h" | 19 #include "components/user_manager/user_info_impl.h" |
| 21 #include "ui/gfx/image/image.h" | 20 #include "ui/gfx/image/image.h" |
| 22 | 21 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 95 |
| 97 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() { | 96 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() { |
| 98 NOTIMPLEMENTED(); | 97 NOTIMPLEMENTED(); |
| 99 return nullptr; | 98 return nullptr; |
| 100 } | 99 } |
| 101 | 100 |
| 102 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { | 101 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { |
| 103 NOTIMPLEMENTED(); | 102 NOTIMPLEMENTED(); |
| 104 } | 103 } |
| 105 | 104 |
| 106 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 105 void ShellDelegateMus::ShelfInit() { |
| 107 return new ShelfDelegateMus(); | 106 NOTIMPLEMENTED(); |
| 107 } |
| 108 |
| 109 void ShellDelegateMus::ShelfShutdown() { |
| 110 NOTIMPLEMENTED(); |
| 108 } | 111 } |
| 109 | 112 |
| 110 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 113 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 111 return new SystemTrayDelegateMus(); | 114 return new SystemTrayDelegateMus(); |
| 112 } | 115 } |
| 113 | 116 |
| 114 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { | 117 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { |
| 115 return base::MakeUnique<WallpaperDelegateMus>(); | 118 return base::MakeUnique<WallpaperDelegateMus>(); |
| 116 } | 119 } |
| 117 | 120 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, | 163 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, |
| 161 bool use_local_state) { | 164 bool use_local_state) { |
| 162 NOTIMPLEMENTED(); | 165 NOTIMPLEMENTED(); |
| 163 } | 166 } |
| 164 | 167 |
| 165 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { | 168 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { |
| 166 NOTIMPLEMENTED(); | 169 NOTIMPLEMENTED(); |
| 167 } | 170 } |
| 168 | 171 |
| 169 } // namespace ash | 172 } // namespace ash |
| OLD | NEW |