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

Side by Side Diff: ash/sysui/shell_delegate_mus.cc

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 3 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
« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | ash/sysui/sysui_application.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/mus/context_menu_mus.h"
14 #include "ash/sysui/app_list_presenter_mus.h" 13 #include "ash/sysui/app_list_presenter_mus.h"
15 #include "ash/sysui/shelf_delegate_mus.h"
16 #include "ash/sysui/wallpaper_delegate_mus.h" 14 #include "ash/sysui/wallpaper_delegate_mus.h"
17 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
18 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
19 #include "components/user_manager/user_info_impl.h" 17 #include "components/user_manager/user_info_impl.h"
20 #include "ui/app_list/presenter/app_list_presenter.h" 18 #include "ui/app_list/presenter/app_list_presenter.h"
21 #include "ui/gfx/image/image.h" 19 #include "ui/gfx/image/image.h"
22 20
23 namespace ash { 21 namespace ash {
24 namespace sysui { 22 namespace sysui {
25 23
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 154
157 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { 155 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) {
158 NOTIMPLEMENTED(); 156 NOTIMPLEMENTED();
159 } 157 }
160 158
161 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { 159 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
162 return app_list_presenter_.get(); 160 return app_list_presenter_.get();
163 } 161 }
164 162
165 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 163 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
166 return new ShelfDelegateMus(model); 164 return nullptr;
167 } 165 }
168 166
169 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 167 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
170 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 168 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
171 return new DefaultSystemTrayDelegate; 169 return new DefaultSystemTrayDelegate;
172 } 170 }
173 171
174 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 172 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
175 return base::MakeUnique<WallpaperDelegateMus>(); 173 return base::MakeUnique<WallpaperDelegateMus>();
176 } 174 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 return base::string16(); 214 return base::string16();
217 } 215 }
218 216
219 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 217 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
220 NOTIMPLEMENTED(); 218 NOTIMPLEMENTED();
221 return gfx::Image(); 219 return gfx::Image();
222 } 220 }
223 221
224 } // namespace sysui 222 } // namespace sysui
225 } // namespace ash 223 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/shelf_delegate_mus.cc ('k') | ash/sysui/sysui_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698