ash/sysui/shell_delegate_mus.cc - Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: ash/sysui/shell_delegate_mus.cc

diff --git a/ash/sysui/shell_delegate_mus.cc b/ash/sysui/shell_delegate_mus.cc

index ea3e518de1bde52e6357bc5986ec6de9de76046c..0734d173a8a8c8e43fe6340db088bf7d80a8ff1f 100644

--- a/ash/sysui/shell_delegate_mus.cc

+++ b/ash/sysui/shell_delegate_mus.cc

@@ -11,7 +11,7 @@

#include "ash/common/system/tray/default_system_tray_delegate.h"

#include "ash/sysui/app_list_presenter_mus.h"

#include "ash/sysui/context_menu_mus.h"

-#include "ash/sysui/pointer_down_watcher_delegate_mus.h"

+#include "ash/sysui/pointer_watcher_delegate_mus.h"

#include "ash/sysui/shelf_delegate_mus.h"

#include "ash/sysui/user_wallpaper_delegate_mus.h"

#include "base/memory/ptr_util.h"

@@ -195,9 +195,9 @@ MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {

return new MediaDelegateStub;

}

-std::unique_ptr<PointerDownWatcherDelegate>

-ShellDelegateMus::CreatePointerDownWatcherDelegate() {

- return base::WrapUnique(new PointerDownWatcherDelegateMus);

+std::unique_ptr<PointerWatcherDelegate>

+ShellDelegateMus::CreatePointerWatcherDelegate() {

+ return base::WrapUnique(new PointerWatcherDelegateMus);

}

ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf,

« no previous file with comments | « ash/sysui/shell_delegate_mus.h ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »