chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces 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/system_tray_delegate_chromeos.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel

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

« ash/common/session/session_state_delegate.h ('K') | « chrome/browser/ui/ash/session_util.cc ('k') | chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

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

index 207db73a3afa7146de0bd5d03e53d189467eb652..246786f65efe3a286f2e905a8a738b503e7d9107 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -13,10 +13,11 @@

#include <vector>

#include "ash/ash_switches.h"

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

#include "ash/common/shell_window_ids.h"

+#include "ash/common/volume_control_delegate.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/metrics/user_metrics_recorder.h"

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

#include "ash/session/session_state_observer.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

@@ -33,7 +34,6 @@

#include "ash/system/user/login_status.h"

#include "ash/system/user/update_observer.h"

#include "ash/system/user/user_observer.h"

-#include "ash/volume_control_delegate.h"

#include "ash/wm/lock_state_controller.h"

#include "base/bind_helpers.h"

#include "base/callback.h"