chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc - Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy.

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/launcher/app_window_launcher_item_controller.cc

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)

Patch Set: Fix test. Created 3 years, 11 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/launcher/app_window_launcher_item_controller.h ('k') | chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

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

index bed0fef78b24111d2c2eb47b2b83e7ed7d6bb434..82ee61f7696204e3bdc053cc29229a87499349b6 100644

--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

@@ -9,7 +9,6 @@

#include "ash/wm/window_util.h"

#include "base/memory/ptr_util.h"

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

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

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

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/window.h"

@@ -138,11 +137,6 @@ base::string16 AppWindowLauncherItemController::GetTitle() {

app_id());

}

-bool AppWindowLauncherItemController::CanPin() const {

- return GetPinnableForAppID(app_id(), launcher_controller()->profile()) ==

- AppListControllerDelegate::PIN_EDITABLE;

void AppWindowLauncherItemController::OnWindowPropertyChanged(

aura::Window* window,

const void* key,