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

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

Issue 1890583002: Renaming App List Shower to App List Presenter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix. 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') | ash/shell.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/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/app_list/presenter/app_list_presenter.h"
18 #include "ui/gfx/image/image.h" 18 #include "ui/gfx/image/image.h"
19 19
20 namespace ash { 20 namespace ash {
21 namespace sysui { 21 namespace sysui {
22 22
23 namespace { 23 namespace {
24 24
25 class SessionStateDelegateStub : public SessionStateDelegate { 25 class SessionStateDelegateStub : public SessionStateDelegate {
26 public: 26 public:
27 SessionStateDelegateStub() 27 SessionStateDelegateStub()
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); } 87 void HandleMediaPrevTrack() override { NOTIMPLEMENTED(); }
88 MediaCaptureState GetMediaCaptureState(UserIndex index) override { 88 MediaCaptureState GetMediaCaptureState(UserIndex index) override {
89 NOTIMPLEMENTED(); 89 NOTIMPLEMENTED();
90 return MEDIA_CAPTURE_NONE; 90 return MEDIA_CAPTURE_NONE;
91 } 91 }
92 92
93 private: 93 private:
94 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 94 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
95 }; 95 };
96 96
97 class AppListShowerMus : public app_list::AppListShower { 97 class AppListPresenterMus : public app_list::AppListPresenter {
98 public: 98 public:
99 AppListShowerMus() {} 99 AppListPresenterMus() {}
100 ~AppListShowerMus() override {} 100 ~AppListPresenterMus() override {}
101 101
102 // app_list::AppListShower: 102 // app_list::AppListPresenter:
103 void Show(aura::Window* window) override { NOTIMPLEMENTED(); } 103 void Show(aura::Window* window) override { NOTIMPLEMENTED(); }
104 void Dismiss() override { NOTIMPLEMENTED(); } 104 void Dismiss() override { NOTIMPLEMENTED(); }
105 bool IsVisible() const override { 105 bool IsVisible() const override {
106 NOTIMPLEMENTED(); 106 NOTIMPLEMENTED();
107 return false; 107 return false;
108 } 108 }
109 bool GetTargetVisibility() const override { 109 bool GetTargetVisibility() const override {
110 NOTIMPLEMENTED(); 110 NOTIMPLEMENTED();
111 return false; 111 return false;
112 } 112 }
113 113
114 private: 114 private:
115 DISALLOW_COPY_AND_ASSIGN(AppListShowerMus); 115 DISALLOW_COPY_AND_ASSIGN(AppListPresenterMus);
116 }; 116 };
117 117
118 } // namespace 118 } // namespace
119 119
120 ShellDelegateMus::ShellDelegateMus() : app_list_shower_(new AppListShowerMus) {} 120 ShellDelegateMus::ShellDelegateMus()
121 : app_list_presenter_(new AppListPresenterMus) {}
121 122
122 ShellDelegateMus::~ShellDelegateMus() {} 123 ShellDelegateMus::~ShellDelegateMus() {}
123 124
124 bool ShellDelegateMus::IsFirstRunAfterBoot() const { 125 bool ShellDelegateMus::IsFirstRunAfterBoot() const {
125 NOTIMPLEMENTED(); 126 NOTIMPLEMENTED();
126 return false; 127 return false;
127 } 128 }
128 129
129 bool ShellDelegateMus::IsIncognitoAllowed() const { 130 bool ShellDelegateMus::IsIncognitoAllowed() const {
130 NOTIMPLEMENTED(); 131 NOTIMPLEMENTED();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 180
180 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver( 181 void ShellDelegateMus::RemoveVirtualKeyboardStateObserver(
181 VirtualKeyboardStateObserver* observer) { 182 VirtualKeyboardStateObserver* observer) {
182 NOTIMPLEMENTED(); 183 NOTIMPLEMENTED();
183 } 184 }
184 185
185 void ShellDelegateMus::OpenUrl(const GURL& url) { 186 void ShellDelegateMus::OpenUrl(const GURL& url) {
186 NOTIMPLEMENTED(); 187 NOTIMPLEMENTED();
187 } 188 }
188 189
189 app_list::AppListShower* ShellDelegateMus::GetAppListShower() { 190 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
190 return app_list_shower_.get(); 191 return app_list_presenter_.get();
191 } 192 }
192 193
193 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { 194 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
194 return new ShelfDelegateMus(model); 195 return new ShelfDelegateMus(model);
195 } 196 }
196 197
197 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { 198 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
198 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; 199 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
199 return new DefaultSystemTrayDelegate; 200 return new DefaultSystemTrayDelegate;
200 } 201 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 return base::string16(); 240 return base::string16();
240 } 241 }
241 242
242 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 243 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
243 NOTIMPLEMENTED(); 244 NOTIMPLEMENTED();
244 return gfx::Image(); 245 return gfx::Image();
245 } 246 }
246 247
247 } // namespace sysui 248 } // namespace sysui
248 } // namespace ash 249 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698