chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc - Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_...""

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/chrome_shell_delegate_chromeos.cc

Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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/system/ash_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a5c687079b424daaec9c7161637662db15ba0b09..8fdfe73cb06a79dec29a53a80b3ca4e5d4f23218 100644

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

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

@@ -18,12 +18,12 @@

#include "chrome/browser/chromeos/display/display_preferences.h"

#include "chrome/browser/chromeos/extensions/media_player_api.h"

#include "chrome/browser/chromeos/extensions/media_player_event_router.h"

-#include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/speech/tts_controller.h"

#include "chrome/browser/ui/ash/caps_lock_delegate_chromeos.h"

#include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"

#include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"

+#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_window.h"