chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 2039543002: Getting rid of ChromeLauncherController::model().

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

Issue 2039543002: Getting rid of ChromeLauncherController::model(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing git cl dependencies 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

« ash/shelf/shelf.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h » ('j') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7b15862376b967c0d5ed6fb31bd762022a5d7741..adbbf98f28e72b9e8d354e75c0beab0a11274a0e 100644

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

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

@@ -198,7 +198,7 @@ class LauncherPlatformAppBrowserTest

ash::ShelfID CreateAppShortcutLauncherItem(const std::string& name) {

return controller_->CreateAppShortcutLauncherItem(

- name, controller_->model()->item_count());

+ name, shelf_model()->item_count());

}

const ash::ShelfItem& GetLastLauncherItem() {