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

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

Issue 1684633002: ash/mash: Introduce a ShelfDelegate implementation for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ash-sysui-window-container
Patch Set: tot-merge Created 4 years, 10 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/mus/shelf_delegate_mus.cc ('k') | ash/screen_util.cc » ('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/mus/shell_delegate_mus.h" 5 #include "ash/mus/shell_delegate_mus.h"
6 6
7 #include "ash/default_accessibility_delegate.h" 7 #include "ash/default_accessibility_delegate.h"
8 #include "ash/default_user_wallpaper_delegate.h" 8 #include "ash/default_user_wallpaper_delegate.h"
9 #include "ash/mus/shelf_delegate_mus.h"
9 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
10 #include "ash/system/tray/default_system_tray_delegate.h" 11 #include "ash/system/tray/default_system_tray_delegate.h"
11 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
12 #include "components/user_manager/user_info_impl.h" 13 #include "components/user_manager/user_info_impl.h"
13 #include "ui/gfx/image/image.h" 14 #include "ui/gfx/image/image.h"
14 15
15 namespace ash { 16 namespace ash {
16 namespace sysui { 17 namespace sysui {
17 18
18 namespace { 19 namespace {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 VirtualKeyboardStateObserver* observer) { 137 VirtualKeyboardStateObserver* observer) {
137 NOTIMPLEMENTED(); 138 NOTIMPLEMENTED();
138 } 139 }
139 140
140 app_list::AppListViewDelegate* ShellDelegateMus::GetAppListViewDelegate() { 141 app_list::AppListViewDelegate* ShellDelegateMus::GetAppListViewDelegate() {
141 NOTIMPLEMENTED(); 142 NOTIMPLEMENTED();
142 return nullptr; 143 return nullptr;
143 } 144 }
144 145
145 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 146 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
146 NOTIMPLEMENTED(); 147 return new ShelfDelegateMus(model);
147 return nullptr;
148 } 148 }
149 149
150 ash::SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 150 ash::SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
151 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 151 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
152 return new DefaultSystemTrayDelegate; 152 return new DefaultSystemTrayDelegate;
153 } 153 }
154 154
155 ash::UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() { 155 ash::UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() {
156 NOTIMPLEMENTED() << " Using the default UserWallpaperDelegate implementation"; 156 NOTIMPLEMENTED() << " Using the default UserWallpaperDelegate implementation";
157 return new DefaultUserWallpaperDelegate(); 157 return new DefaultUserWallpaperDelegate();
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 return base::string16(); 195 return base::string16();
196 } 196 }
197 197
198 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 198 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
199 NOTIMPLEMENTED(); 199 NOTIMPLEMENTED();
200 return gfx::Image(); 200 return gfx::Image();
201 } 201 }
202 202
203 } // namespace sysui 203 } // namespace sysui
204 } // namespace ash 204 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | ash/screen_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698