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

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

similarity index 91%

rename from ash/system/tray/system_tray_bubble.h

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

index 31bb500252b40783edea2d8d00a3ad3eafbc76b0..7714710d6c2be3ec42391d64c7855cbd2a059cc0 100644

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

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

@@ -2,13 +2,13 @@

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

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

-#define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

+#ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

+#define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

#include <memory>

#include <vector>

-#include "ash/system/user/login_status.h"

+#include "ash/common/login_status.h"

#include "base/macros.h"

#include "base/timer/timer.h"

#include "ui/views/bubble/tray_bubble_view.h"

@@ -75,4 +75,4 @@ class SystemTrayBubble {

} // namespace ash

-#endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

+#endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_

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