chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc - Issue 2090133003: Moved methods that don't rely on internal state out of ChromeLauncherController.

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 2090133003: Moved methods that don't rely on internal state out of ChromeLauncherController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Replaced #include statements with forward declarations in chrome_launcher_controller_util.h 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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc ('K') | « chrome/browser/ui/ash/launcher/launcher_context_menu.cc ('k') | chrome/chrome_browser_ui.gypi » ('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 2bebb9ce09fa2cf5be1a804eb9e1a19fe25b76c9..f0657e1f7682c5770fd06d1f13bb2d6e02c424da 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

@@ -24,6 +24,7 @@

#include "ash/shelf/shelf_delegate.h"

#include "ash/shell.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

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

#endif

AppInfoFooterPanel::AppInfoFooterPanel(gfx::NativeWindow parent_window,

@@ -172,7 +173,8 @@ bool AppInfoFooterPanel::CanSetPinnedToShelf() const {

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

return app_->id() != extension_misc::kChromeAppId && !app_->is_extension() &&

(!ChromeLauncherController::instance() ||

- ChromeLauncherController::instance()->GetPinnable(app_->id()) ==

+ GetPinnableForAppID(

+ app_->id(), ChromeLauncherController::instance()->GetProfile()) ==

AppListControllerDelegate::PIN_EDITABLE);

}

#endif // USE_ASH