chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 1921403002: Pin apps from prefs on the mash shelf.

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_unittest.cc

Issue 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Only include arc for cros. Created 4 years, 8 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/app_tab_helper.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.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_unittest.cc

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

index a27a51ae946f27d4b48bd73bce42e047132f9a71..934bafecd08d0e0c1364c11e7d83312fc7c554ef 100644

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

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

@@ -31,6 +31,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/test_extension_system.h"

#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"

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

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

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

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

@@ -191,7 +192,7 @@ class TestAppIconLoaderImpl : public AppIconLoader {

};

// Test implementation of AppTabHelper.

-class TestAppTabHelperImpl : public ChromeLauncherController::AppTabHelper {

+class TestAppTabHelperImpl : public AppTabHelper {

public:

TestAppTabHelperImpl() {}

~TestAppTabHelperImpl() override {}

@@ -500,7 +501,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {

launcher_controller_->SetAppIconLoadersForTest(loaders);

}

- void SetAppTabHelper(ChromeLauncherController::AppTabHelper* helper) {

+ void SetAppTabHelper(AppTabHelper* helper) {

launcher_controller_->SetAppTabHelperForTest(helper);

}