chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 2098023002: mash: Migrate remaining tray observers and notify functions.

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.h

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. 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/shell.h ('K') | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_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.h

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

index bebd5113691f73af641bdcbfe1042b8d0abbc512..5cc1c341458a9e4d5425b8c9c739c06eb6823fc3 100644

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

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

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

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

#include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"

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

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

#include "base/callback_forward.h"

#include "base/callback_list.h"

#include "base/compiler_specific.h"

@@ -45,7 +44,7 @@

#include "ui/chromeos/ime/input_method_menu_manager.h"

namespace ash {

-class WmSystemTrayNotifier;

+class SystemTrayNotifier;

class VPNDelegate;

}

@@ -172,8 +171,6 @@ class SystemTrayDelegateChromeOS

ash::SystemTrayNotifier* GetSystemTrayNotifier();

- ash::WmSystemTrayNotifier* GetWmSystemTrayNotifier();

void SetProfile(Profile* profile);

bool UnsetProfile(Profile* profile);