ash/common/system/tray/tray_event_filter.h - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

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/common/system/tray/tray_event_filter.h

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict Created 4 years, 6 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/common/system/tray/tray_event_filter.h

diff --git a/ash/system/tray/tray_event_filter.h b/ash/common/system/tray/tray_event_filter.h

similarity index 89%

rename from ash/system/tray/tray_event_filter.h

rename to ash/common/system/tray/tray_event_filter.h

index ceee4d30bd94b0408dc543c5f0c08f2d7a538299..88a5ba8085c61a5daf12914a73c113d5e43c8d24 100644

--- a/ash/system/tray/tray_event_filter.h

+++ b/ash/common/system/tray/tray_event_filter.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

-#define ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

+#ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

+#define ASH_COMMON_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

#include <set>

@@ -50,4 +50,4 @@ class TrayEventFilter : public views::PointerWatcher {

} // namespace ash

-#endif // ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

+#endif // ASH_COMMON_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_

« no previous file with comments | « ash/common/system/tray/tray_bubble_wrapper.cc ('k') | ash/common/system/tray/tray_event_filter.cc » ('j') | no next file with comments »