chrome/browser/ui/ash/app_list/app_list_controller_ash.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/ash/app_list/app_list_controller_ash.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: Fixed usage in unittests 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

« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

index 1245ad6f7958f3b3228bd2c2adbfe72b50a8edbd..f2a01989a444aafccc6deb78ccd5d14c4c4e89bd 100644

--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

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

#include "ash/shell.h"

#include "chrome/browser/profiles/profile.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/browser_commands.h"

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_navigator_params.h"

@@ -57,7 +58,8 @@ void AppListControllerDelegateAsh::UnpinApp(const std::string& app_id) {

AppListControllerDelegate::Pinnable AppListControllerDelegateAsh::GetPinnable(

const std::string& app_id) {

- return ChromeLauncherController::instance()->GetPinnable(app_id);

+ return chrome::util::GetPinnable(

+ ChromeLauncherController::instance()->GetProfile(), app_id);

}

void AppListControllerDelegateAsh::OnShowChildDialog() {