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

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

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 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/test/test_shell_delegate.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/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/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/system/tray/default_system_tray_delegate.h" 11 #include "ash/common/system/tray/default_system_tray_delegate.h"
12 #include "ash/sysui/app_list_presenter_mus.h" 12 #include "ash/sysui/app_list_presenter_mus.h"
13 #include "ash/sysui/context_menu_mus.h" 13 #include "ash/sysui/context_menu_mus.h"
14 #include "ash/sysui/pointer_down_watcher_delegate_mus.h" 14 #include "ash/sysui/pointer_watcher_delegate_mus.h"
15 #include "ash/sysui/shelf_delegate_mus.h" 15 #include "ash/sysui/shelf_delegate_mus.h"
16 #include "ash/sysui/user_wallpaper_delegate_mus.h" 16 #include "ash/sysui/user_wallpaper_delegate_mus.h"
17 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "components/user_manager/user_info_impl.h" 19 #include "components/user_manager/user_info_impl.h"
20 #include "ui/app_list/presenter/app_list_presenter.h" 20 #include "ui/app_list/presenter/app_list_presenter.h"
21 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
22 22
23 namespace ash { 23 namespace ash {
24 namespace sysui { 24 namespace sysui {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { 188 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
189 NOTIMPLEMENTED(); 189 NOTIMPLEMENTED();
190 return nullptr; 190 return nullptr;
191 } 191 }
192 192
193 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 193 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
194 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 194 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
195 return new MediaDelegateStub; 195 return new MediaDelegateStub;
196 } 196 }
197 197
198 std::unique_ptr<PointerDownWatcherDelegate> 198 std::unique_ptr<PointerWatcherDelegate>
199 ShellDelegateMus::CreatePointerDownWatcherDelegate() { 199 ShellDelegateMus::CreatePointerWatcherDelegate() {
200 return base::WrapUnique(new PointerDownWatcherDelegateMus); 200 return base::WrapUnique(new PointerWatcherDelegateMus);
201 } 201 }
202 202
203 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, 203 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf,
204 const ShelfItem* item) { 204 const ShelfItem* item) {
205 return new ContextMenuMus(wm_shelf); 205 return new ContextMenuMus(wm_shelf);
206 } 206 }
207 207
208 GPUSupport* ShellDelegateMus::CreateGPUSupport() { 208 GPUSupport* ShellDelegateMus::CreateGPUSupport() {
209 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; 209 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation";
210 return new GPUSupportStub(); 210 return new GPUSupportStub();
211 } 211 }
212 212
213 base::string16 ShellDelegateMus::GetProductName() const { 213 base::string16 ShellDelegateMus::GetProductName() const {
214 NOTIMPLEMENTED(); 214 NOTIMPLEMENTED();
215 return base::string16(); 215 return base::string16();
216 } 216 }
217 217
218 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 218 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
219 NOTIMPLEMENTED(); 219 NOTIMPLEMENTED();
220 return gfx::Image(); 220 return gfx::Image();
221 } 221 }
222 222
223 } // namespace sysui 223 } // namespace sysui
224 } // namespace ash 224 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698