ash/common/system/chromeos/screen_security/screen_share_tray_item.cc - Issue 2775973002: Promotes more accessors from WmShell to Shell

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: ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)

Patch Set: feedback Created 3 years, 9 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 | « ash/common/system/chromeos/screen_security/screen_capture_tray_item.cc ('k') | ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

diff --git a/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc b/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

index 61d26325b959cc9ea67bced7ef0999ae4f162a44..d5f5cc31626d54f7ad6782c29ccc1ca47bc85a00 100644

--- a/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

+++ b/ash/common/system/chromeos/screen_security/screen_share_tray_item.cc

@@ -8,8 +8,8 @@

#include "ash/common/system/system_notifier.h"

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

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

#include "ash/resources/grit/ash_resources.h"

+#include "ash/shell.h"

#include "ash/strings/grit/ash_strings.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -26,11 +26,11 @@ const char kScreenShareNotificationId[] = "chrome://screen/share";

ScreenShareTrayItem::ScreenShareTrayItem(SystemTray* system_tray)

: ScreenTrayItem(system_tray, UMA_SCREEN_SHARE) {

- WmShell::Get()->system_tray_notifier()->AddScreenShareObserver(this);

+ Shell::Get()->system_tray_notifier()->AddScreenShareObserver(this);

}

ScreenShareTrayItem::~ScreenShareTrayItem() {

- WmShell::Get()->system_tray_notifier()->RemoveScreenShareObserver(this);

+ Shell::Get()->system_tray_notifier()->RemoveScreenShareObserver(this);

}

views::View* ScreenShareTrayItem::CreateDefaultView(LoginStatus status) {