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

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

Issue 2360143004: mash: Add SystemTrayClient interface, use to show date settings (Closed)
Patch Set: reparent 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
« no previous file with comments | « ash/mus/manifest.json ('k') | ash/mus/system_tray_delegate_mus.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/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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { 164 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
165 return &app_list_presenter_; 165 return &app_list_presenter_;
166 } 166 }
167 167
168 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 168 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
169 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); 169 return new ShelfDelegateMus(WmShell::Get()->shelf_model());
170 } 170 }
171 171
172 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 172 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
173 return new SystemTrayDelegateMus; 173 return new SystemTrayDelegateMus(connector_);
174 } 174 }
175 175
176 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 176 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
177 return base::MakeUnique<WallpaperDelegateMus>(connector_); 177 return base::MakeUnique<WallpaperDelegateMus>(connector_);
178 } 178 }
179 179
180 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 180 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
181 // TODO: http://crbug.com/647416. 181 // TODO: http://crbug.com/647416.
182 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 182 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
183 return new SessionStateDelegateStub; 183 return new SessionStateDelegateStub;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 NOTIMPLEMENTED(); 218 NOTIMPLEMENTED();
219 return base::string16(); 219 return base::string16();
220 } 220 }
221 221
222 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 222 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
223 NOTIMPLEMENTED(); 223 NOTIMPLEMENTED();
224 return gfx::Image(); 224 return gfx::Image();
225 } 225 }
226 226
227 } // namespace ash 227 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/manifest.json ('k') | ash/mus/system_tray_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698