ash/shell.h - Issue 2127263002: Keep the SystemModalContainerEventHandler added

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/shell.h

Issue 2127263002: Keep the SystemModalContainerEventHandler added (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: ash/shell.h

diff --git a/ash/shell.h b/ash/shell.h

index 7b109fe85c8f754975714256635c52853da275ea..bbf38727c535279b35667f006a028124e2a164ad 100644

--- a/ash/shell.h

+++ b/ash/shell.h

@@ -527,6 +527,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,

GPUSupport* gpu_support() { return gpu_support_.get(); }

+ // ash::SystemModalContainerEventFilterDelegate overrides:

oshima 2016/07/07 22:01:17 nit: // SystemModalContainerEventFilterDelegate:

+ bool CanWindowReceiveEvents(aura::Window* window) override;

private:

FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);

FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);

@@ -553,9 +556,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,

// Prepares the shelf to be deleted.

void ShutdownShelf();

- // ash::SystemModalContainerEventFilterDelegate overrides:

- bool CanWindowReceiveEvents(aura::Window* window) override;

// Overridden from ui::EventTarget:

bool CanAcceptEvent(const ui::Event& event) override;

EventTarget* GetParentTarget() override;

« no previous file with comments | « no previous file | components/exo/pointer.cc » ('j') | components/exo/pointer_unittest.cc » ('J')