chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc - Issue 2761373002: Move yet more 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: chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)

Patch Set: merge 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 | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/test/base/view_event_test_platform_part_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

index 2a1b343f1610d65a63be6882cab58845d5e8c3e4..b06e177c933440081bfbd82291005438ad26caed 100644

--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc

@@ -22,7 +22,7 @@

#if defined(USE_ASH)

#include "ash/common/shelf/shelf_delegate.h" // nogncheck

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

+#include "ash/shell.h" // nogncheck

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" // nogncheck

#endif

@@ -90,7 +90,7 @@ void AppInfoFooterPanel::UpdatePinButtons(bool focus_visible_button) {

#if defined(USE_ASH)

if (pin_to_shelf_button_ && unpin_from_shelf_button_) {

bool is_pinned =

- !ash::WmShell::Get()->shelf_delegate()->IsAppPinned(app_->id());

+ !ash::Shell::Get()->shelf_delegate()->IsAppPinned(app_->id());

pin_to_shelf_button_->SetVisible(is_pinned);

unpin_from_shelf_button_->SetVisible(!is_pinned);

@@ -152,7 +152,7 @@ bool AppInfoFooterPanel::CanCreateShortcuts() const {

#if defined(USE_ASH)

void AppInfoFooterPanel::SetPinnedToShelf(bool value) {

DCHECK(CanSetPinnedToShelf());

- ash::ShelfDelegate* shelf_delegate = ash::WmShell::Get()->shelf_delegate();

+ ash::ShelfDelegate* shelf_delegate = ash::Shell::Get()->shelf_delegate();

DCHECK(shelf_delegate);

if (value)

shelf_delegate->PinAppWithID(app_->id());

@@ -165,7 +165,7 @@ void AppInfoFooterPanel::SetPinnedToShelf(bool value) {

bool AppInfoFooterPanel::CanSetPinnedToShelf() const {

// Non-Ash platforms don't have a shelf.

- if (!ash::WmShell::HasInstance())

+ if (!ash::Shell::HasInstance())

return false;

// The Chrome app can't be unpinned, and extensions can't be pinned.