ash/system/chromeos/network/tray_sms.cc - 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/chromeos/network/tray_sms.cc

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/chromeos/network/tray_sms.cc

diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc

index 07035efe55c01873d2ec6e341345147b8f0e84d3..e52820fd40d4db4a5be2cb758e17fb213a878880 100644

--- a/ash/system/chromeos/network/tray_sms.cc

+++ b/ash/system/chromeos/network/tray_sms.cc

@@ -5,6 +5,7 @@

#include "ash/system/chromeos/network/tray_sms.h"

#include "ash/common/system/tray/fixed_sized_scroll_view.h"

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

#include "ash/common/system/tray/tray_constants.h"

#include "ash/common/system/tray/tray_details_view.h"

#include "ash/common/system/tray/tray_item_more.h"

@@ -13,7 +14,6 @@

#include "ash/common/system/tray/view_click_listener.h"

#include "ash/shell.h"

#include "ash/system/tray/system_tray.h"

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

#include "ash/system/tray/system_tray_notifier.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

« no previous file with comments | « ash/shelf/overflow_bubble.cc ('k') | ash/system/chromeos/session/logout_button_tray.h » ('j') | no next file with comments »