ash/common/system/chromeos/network/tray_network.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

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

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/common/system/chromeos/network/tray_network_state_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/network/tray_network.cc

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

index 77adb96c551183c5ad0d9d205418e24cfe134516..318b5eb946d670c020f0de209208c86f61f34469 100644

--- a/ash/common/system/chromeos/network/tray_network.cc

+++ b/ash/common/system/chromeos/network/tray_network.cc

@@ -8,6 +8,7 @@

#include "ash/common/shelf/wm_shelf_util.h"

#include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"

#include "ash/common/system/chromeos/network/tray_network_state_observer.h"

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

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

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

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

@@ -15,7 +16,6 @@

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

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

#include "ash/common/wm_shell.h"

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

#include "base/command_line.h"

#include "base/strings/utf_string_conversions.h"

#include "chromeos/network/network_state.h"