chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.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/browser_shortcut_launcher_item_controller.cc

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

Patch Set: 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/chrome_launcher_controller.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index bd4c39734264403f68ea464a21c9e51614125aba..76ee5519c9c9f85e1b5a6ed3c042a376fae4e78b 100644

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

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

@@ -74,7 +74,7 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {

if (!ash::Shell::HasInstance())

return;

- ash::ShelfModel* model = launcher_controller()->model();

+ ash::ShelfModel* model = ash::Shell::GetInstance()->shelf_model();

// Determine the new browser's active state and change if necessary.

int browser_index = model->GetItemIndexForType(ash::TYPE_BROWSER_SHORTCUT);

« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('J')