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

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

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Sync and rebase. Created 4 years, 2 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
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 <utility> 7 #include <utility>
8 8
9 #include "ash/common/gpu_support_stub.h" 9 #include "ash/common/gpu_support_stub.h"
10 #include "ash/common/media_delegate.h" 10 #include "ash/common/media_delegate.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { 169 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) {
170 NOTIMPLEMENTED(); 170 NOTIMPLEMENTED();
171 } 171 }
172 172
173 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { 173 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
174 return &app_list_presenter_; 174 return &app_list_presenter_;
175 } 175 }
176 176
177 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 177 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
178 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); 178 return new ShelfDelegateMus();
179 } 179 }
180 180
181 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 181 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
182 #if defined(OS_CHROMEOS) 182 #if defined(OS_CHROMEOS)
183 return new SystemTrayDelegateMus(); 183 return new SystemTrayDelegateMus();
184 #else 184 #else
185 // Windows and Linux do not support the services required for most system tray 185 // Windows and Linux do not support the services required for most system tray
186 // items. Use the same stub delegate as ash_shell_with_content. 186 // items. Use the same stub delegate as ash_shell_with_content.
187 return new DefaultSystemTrayDelegate(); 187 return new DefaultSystemTrayDelegate();
188 #endif 188 #endif
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 NOTIMPLEMENTED(); 233 NOTIMPLEMENTED();
234 return base::string16(); 234 return base::string16();
235 } 235 }
236 236
237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
238 NOTIMPLEMENTED(); 238 NOTIMPLEMENTED();
239 return gfx::Image(); 239 return gfx::Image();
240 } 240 }
241 241
242 } // namespace ash 242 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698