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

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

Issue 1879603002: mash: Fix ash_sysui crash on startup due to missing AppListShower (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix deps Created 4 years, 8 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/shell_delegate_mus.h ('k') | no next file » | 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/gpu_support_stub.h" 9 #include "ash/gpu_support_stub.h"
10 #include "ash/media_delegate.h" 10 #include "ash/media_delegate.h"
11 #include "ash/mus/context_menu_mus.h" 11 #include "ash/mus/context_menu_mus.h"
12 #include "ash/mus/shelf_delegate_mus.h" 12 #include "ash/mus/shelf_delegate_mus.h"
13 #include "ash/session/session_state_delegate.h" 13 #include "ash/session/session_state_delegate.h"
14 #include "ash/system/tray/default_system_tray_delegate.h" 14 #include "ash/system/tray/default_system_tray_delegate.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "components/user_manager/user_info_impl.h" 16 #include "components/user_manager/user_info_impl.h"
17 #include "ui/app_list/shower/app_list_shower.h"
17 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
18 19
19 namespace ash { 20 namespace ash {
20 namespace sysui { 21 namespace sysui {
21 22
22 namespace { 23 namespace {
23 24
24 class SessionStateDelegateStub : public SessionStateDelegate { 25 class SessionStateDelegateStub : public SessionStateDelegate {
25 public: 26 public:
26 SessionStateDelegateStub() 27 SessionStateDelegateStub()
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); } 87 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); }
87 MediaCaptureState GetMediaCaptureState(UserIndex index) override { 88 MediaCaptureState GetMediaCaptureState(UserIndex index) override {
88 NOTIMPLEMENTED(); 89 NOTIMPLEMENTED();
89 return MEDIA_CAPTURE_NONE; 90 return MEDIA_CAPTURE_NONE;
90 } 91 }
91 92
92 private: 93 private:
93 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 94 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
94 }; 95 };
95 96
97 class AppListShowerMus : public app_list::AppListShower {
98 public:
99 AppListShowerMus() {}
100 ~AppListShowerMus() override {}
101
102 // app_list::AppListShower:
103 void Show(aura::Window* window) override { NOTIMPLEMENTED(); }
104 void Dismiss() override { NOTIMPLEMENTED(); }
105 bool IsVisible() const override {
106 NOTIMPLEMENTED();
107 return false;
108 }
109 bool GetTargetVisibility() const override {
110 NOTIMPLEMENTED();
111 return false;
112 }
113
114 private:
115 DISALLOW_COPY_AND_ASSIGN(AppListShowerMus);
116 };
117
96 } // namespace 118 } // namespace
97 119
98 ShellDelegateMus::ShellDelegateMus() {} 120 ShellDelegateMus::ShellDelegateMus() : app_list_shower_(new AppListShowerMus) {}
99 121
100 ShellDelegateMus::~ShellDelegateMus() {} 122 ShellDelegateMus::~ShellDelegateMus() {}
101 123
102 bool ShellDelegateMus::IsFirstRunAfterBoot() const { 124 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
103 NOTIMPLEMENTED(); 125 NOTIMPLEMENTED();
104 return false; 126 return false;
105 } 127 }
106 128
107 bool ShellDelegateMus::IsIncognitoAllowed() const { 129 bool ShellDelegateMus::IsIncognitoAllowed() const {
108 NOTIMPLEMENTED(); 130 NOTIMPLEMENTED();
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver( 180 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver(
159 VirtualKeyboardStateObserver* observer) { 181 VirtualKeyboardStateObserver* observer) {
160 NOTIMPLEMENTED(); 182 NOTIMPLEMENTED();
161 } 183 }
162 184
163 void ShellDelegateMus::OpenUrl(const GURL& url) { 185 void ShellDelegateMus::OpenUrl(const GURL& url) {
164 NOTIMPLEMENTED(); 186 NOTIMPLEMENTED();
165 } 187 }
166 188
167 app_list::AppListShower* ShellDelegateMus::GetAppListShower() { 189 app_list::AppListShower* ShellDelegateMus::GetAppListShower() {
168 NOTIMPLEMENTED(); 190 return app_list_shower_.get();
169 return nullptr;
170 } 191 }
171 192
172 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 193 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
173 return new ShelfDelegateMus(model); 194 return new ShelfDelegateMus(model);
174 } 195 }
175 196
176 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 197 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
177 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 198 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
178 return new DefaultSystemTrayDelegate; 199 return new DefaultSystemTrayDelegate;
179 } 200 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 return base::string16(); 239 return base::string16();
219 } 240 }
220 241
221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 242 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
222 NOTIMPLEMENTED(); 243 NOTIMPLEMENTED();
223 return gfx::Image(); 244 return gfx::Image();
224 } 245 }
225 246
226 } // namespace sysui 247 } // namespace sysui
227 } // namespace ash 248 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698