chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc - Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash.

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/chrome_launcher_controller_impl_unittest.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)

Patch Set: Sync and rebase. Created 4 years, 2 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.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 560c363901dc1e9cb6fb8d70205f6968f216d6a8..3e943a15084b3dafa500dda27f813cfff287e856 100644

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

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

@@ -293,7 +293,7 @@ class TestV2AppLauncherItemController : public LauncherItemController {

}

bool IsDraggable() override { return false; }

bool CanPin() const override {

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

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

AppListControllerDelegate::PIN_EDITABLE;

}

bool ShouldShowTooltip() override { return false; }

@@ -547,7 +547,8 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {

}

void SetLauncherControllerHelper(LauncherControllerHelper* helper) {

- launcher_controller_->SetLauncherControllerHelperForTest(helper);

+ launcher_controller_->SetLauncherControllerHelperForTest(

+ base::WrapUnique<LauncherControllerHelper>(helper));

}

void InsertPrefValue(base::ListValue* pref_value,