| 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/sysui/shell_delegate_mus.h" | 5 #include "ash/sysui/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/default_accessibility_delegate.h" | 7 #include "ash/common/default_accessibility_delegate.h" |
| 8 #include "ash/common/gpu_support_stub.h" | 8 #include "ash/common/gpu_support_stub.h" |
| 9 #include "ash/common/media_delegate.h" | 9 #include "ash/common/media_delegate.h" |
| 10 #include "ash/common/palette_delegate.h" | 10 #include "ash/common/palette_delegate.h" |
| 11 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
| 12 #include "ash/common/system/tray/default_system_tray_delegate.h" | 12 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 13 #include "ash/sysui/app_list_presenter_mus.h" | 13 #include "ash/sysui/app_list_presenter_mus.h" |
| 14 #include "ash/sysui/context_menu_mus.h" | 14 #include "ash/sysui/context_menu_mus.h" |
| 15 #include "ash/sysui/pointer_watcher_delegate_mus.h" | 15 #include "ash/sysui/pointer_watcher_delegate_mus.h" |
| 16 #include "ash/sysui/shelf_delegate_mus.h" | |
| 17 #include "ash/sysui/user_wallpaper_delegate_mus.h" | 16 #include "ash/sysui/user_wallpaper_delegate_mus.h" |
| 18 #include "base/memory/ptr_util.h" | 17 #include "base/memory/ptr_util.h" |
| 19 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
| 20 #include "components/user_manager/user_info_impl.h" | 19 #include "components/user_manager/user_info_impl.h" |
| 21 #include "ui/app_list/presenter/app_list_presenter.h" | 20 #include "ui/app_list/presenter/app_list_presenter.h" |
| 22 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 23 | 22 |
| 24 namespace ash { | 23 namespace ash { |
| 25 namespace sysui { | 24 namespace sysui { |
| 26 | 25 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 | 156 |
| 158 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { | 157 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { |
| 159 NOTIMPLEMENTED(); | 158 NOTIMPLEMENTED(); |
| 160 } | 159 } |
| 161 | 160 |
| 162 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { | 161 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { |
| 163 return app_list_presenter_.get(); | 162 return app_list_presenter_.get(); |
| 164 } | 163 } |
| 165 | 164 |
| 166 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 165 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |
| 167 return new ShelfDelegateMus(model); | 166 return nullptr; |
| 168 } | 167 } |
| 169 | 168 |
| 170 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 169 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 171 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; | 170 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; |
| 172 return new DefaultSystemTrayDelegate; | 171 return new DefaultSystemTrayDelegate; |
| 173 } | 172 } |
| 174 | 173 |
| 175 UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() { | 174 UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() { |
| 176 return new UserWallpaperDelegateMus(); | 175 return new UserWallpaperDelegateMus(); |
| 177 } | 176 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 return base::string16(); | 220 return base::string16(); |
| 222 } | 221 } |
| 223 | 222 |
| 224 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 223 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 225 NOTIMPLEMENTED(); | 224 NOTIMPLEMENTED(); |
| 226 return gfx::Image(); | 225 return gfx::Image(); |
| 227 } | 226 } |
| 228 | 227 |
| 229 } // namespace sysui | 228 } // namespace sysui |
| 230 } // namespace ash | 229 } // namespace ash |
| OLD | NEW |