ash/system/web_notification/web_notification_tray.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/system/web_notification/web_notification_tray.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/system/web_notification/web_notification_tray.h

diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h

index 504460d6198cf04dccf8900d9c0535b166deb3f9..f36246329f2b1113395dbb28bfc57e6c065aed3d 100644

--- a/ash/system/web_notification/web_notification_tray.h

+++ b/ash/system/web_notification/web_notification_tray.h

@@ -9,7 +9,7 @@

#include "ash/ash_export.h"

#include "ash/common/login_status.h"

-#include "ash/system/tray/tray_background_view.h"

+#include "ash/common/system/tray/tray_background_view.h"

#include "base/gtest_prod_util.h"

#include "base/macros.h"

#include "base/memory/weak_ptr.h"

@@ -169,6 +169,7 @@ class ASH_EXPORT WebNotificationTray

bool IsPopupVisible() const;

message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();

+ StatusAreaWidget* status_area_widget_;

std::unique_ptr<message_center::MessageCenterTray> message_center_tray_;

std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_;

std::unique_ptr<message_center::MessagePopupCollection> popup_collection_;

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