chrome/browser/ui/ash/media_delegate_chromeos.cc - 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/media_delegate_chromeos.cc

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/chromeos/ui/screen_capture_notification_ui_chromeos.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9e638b65a1313f5837d42ae6b9a119489466e7ab..d7533e7bdaabfb8a48026676bf21ea111e4e9abb 100644

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

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

@@ -4,9 +4,9 @@

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

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

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

#include "ash/content/shell_content_state.h"

-#include "ash/shell.h"

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

#include "base/location.h"

#include "base/message_loop/message_loop.h"

#include "base/single_thread_task_runner.h"

@@ -162,7 +162,5 @@ void MediaDelegateChromeOS::OnRequestUpdate(

}

void MediaDelegateChromeOS::NotifyMediaCaptureChange() {

- ash::Shell::GetInstance()

- ->system_tray_notifier()

- ->NotifyMediaCaptureChanged();

+ ash::WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged();

}