chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 2056823002: mash: Move SystemTrayDelegate and dependencies 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: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/chromeos/profiles/avatar_menu_actions_chromeos.cc ('k') | chrome/browser/ui/ash/network_connect_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

index 35b9f5df09b0cbf91a14fd3f307b21343b6c5a14..9c034830bbd6210bb132226767c4617f35e505a4 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -11,12 +11,12 @@

#include "ash/ash_switches.h"

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

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

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

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/multi_profile_uma.h"

#include "ash/root_window_controller.h"

#include "ash/shelf/shelf.h"

#include "ash/shell.h"

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

#include "ash/wm/window_util.h"

#include "base/command_line.h"

#include "base/macros.h"