ash/common/system/chromeos/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.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

Index: ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

diff --git a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

index cae780cdc81c408e737197a90c1e096e64cb3b04..482d4f09edc7044ca55ae146e732ddb987cf3472 100644

--- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

+++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc

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

#include "ash/common/session/session_state_delegate.h"

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

#include "ash/common/system/tray/hover_highlight_view.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/throbber_view.h"

@@ -16,7 +17,6 @@

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

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

#include "ash/common/wm_shell.h"

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

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/base/l10n/l10n_util.h"

« no previous file with comments | « ash/common/system/cast/tray_cast.cc ('k') | ash/common/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »