ash/aura/wm_shell_aura.h - 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/aura/wm_shell_aura.h

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/aura/wm_shell_aura.h

diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h

index f5deab950ddb5deabb3eadc623887aa16ffd6476..882afa59f31ff845f1a91fc2603ff2fa00837845 100644

--- a/ash/aura/wm_shell_aura.h

+++ b/ash/aura/wm_shell_aura.h

@@ -61,8 +61,8 @@ class ASH_EXPORT WmShellAura : public WmShell,

void RemoveActivationObserver(WmActivationObserver* observer) override;

void AddDisplayObserver(WmDisplayObserver* observer) override;

void RemoveDisplayObserver(WmDisplayObserver* observer) override;

- void AddPointerDownWatcher(views::PointerDownWatcher* watcher) override;

- void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) override;

+ void AddPointerWatcher(views::PointerWatcher* watcher) override;

+ void RemovePointerWatcher(views::PointerWatcher* watcher) override;

#if defined(OS_CHROMEOS)

void ToggleIgnoreExternalKeyboard() override;

#endif

« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »