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

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

Issue 2335833002: mash: Port ash_sysui app list presenter to mojo:ash. (Closed)
Patch Set: Reorder ShellDelegateMus members. 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/shell_delegate_mus.h ('k') | ash/sysui/sysui_application.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/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/common/wallpaper/wallpaper_delegate.h" 13 #include "ash/common/wallpaper/wallpaper_delegate.h"
14 #include "ash/sysui/app_list_presenter_mus.h"
15 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
16 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
17 #include "components/user_manager/user_info_impl.h" 16 #include "components/user_manager/user_info_impl.h"
18 #include "ui/app_list/presenter/app_list_presenter.h"
19 #include "ui/gfx/image/image.h" 17 #include "ui/gfx/image/image.h"
20 18
21 namespace ash { 19 namespace ash {
22 namespace sysui { 20 namespace sysui {
23 21
24 namespace { 22 namespace {
25 23
26 class SessionStateDelegateStub : public SessionStateDelegate { 24 class SessionStateDelegateStub : public SessionStateDelegate {
27 public: 25 public:
28 SessionStateDelegateStub() 26 SessionStateDelegateStub()
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 NOTIMPLEMENTED(); 90 NOTIMPLEMENTED();
93 return MEDIA_CAPTURE_NONE; 91 return MEDIA_CAPTURE_NONE;
94 } 92 }
95 93
96 private: 94 private:
97 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 95 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
98 }; 96 };
99 97
100 } // namespace 98 } // namespace
101 99
102 ShellDelegateMus::ShellDelegateMus( 100 ShellDelegateMus::ShellDelegateMus() {}
103 std::unique_ptr<AppListPresenterMus> app_list_presenter)
104 : app_list_presenter_(std::move(app_list_presenter)) {}
105 101
106 ShellDelegateMus::~ShellDelegateMus() {} 102 ShellDelegateMus::~ShellDelegateMus() {}
107 103
108 bool ShellDelegateMus::IsFirstRunAfterBoot() const { 104 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
109 NOTIMPLEMENTED(); 105 NOTIMPLEMENTED();
110 return false; 106 return false;
111 } 107 }
112 108
113 bool ShellDelegateMus::IsIncognitoAllowed() const { 109 bool ShellDelegateMus::IsIncognitoAllowed() const {
114 NOTIMPLEMENTED(); 110 NOTIMPLEMENTED();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() { 146 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() {
151 NOTIMPLEMENTED(); 147 NOTIMPLEMENTED();
152 return nullptr; 148 return nullptr;
153 } 149 }
154 150
155 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { 151 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) {
156 NOTIMPLEMENTED(); 152 NOTIMPLEMENTED();
157 } 153 }
158 154
159 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { 155 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
160 return app_list_presenter_.get(); 156 NOTIMPLEMENTED();
157 return nullptr;
161 } 158 }
162 159
163 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 160 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
161 NOTIMPLEMENTED();
164 return nullptr; 162 return nullptr;
165 } 163 }
166 164
167 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 165 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
168 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 166 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
169 return new DefaultSystemTrayDelegate; 167 return new DefaultSystemTrayDelegate;
170 } 168 }
171 169
172 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { 170 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() {
173 NOTIMPLEMENTED(); 171 NOTIMPLEMENTED();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 return base::string16(); 213 return base::string16();
216 } 214 }
217 215
218 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 216 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
219 NOTIMPLEMENTED(); 217 NOTIMPLEMENTED();
220 return gfx::Image(); 218 return gfx::Image();
221 } 219 }
222 220
223 } // namespace sysui 221 } // namespace sysui
224 } // namespace ash 222 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/sysui/sysui_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698