chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc - Issue 71653003: ash: Rename LauncherModel to ShelfModel.

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 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chrome changes Created 7 years, 1 month 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 | « chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | no next file with comments »
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 0f8b1a116565a64bd4a26125600362a3c33e0c64..3c3a2ae0393a09a83d831a9d627c33e8c7b24d08 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

@@ -7,7 +7,7 @@

#include <vector>

#include "ash/launcher/launcher.h"

-#include "ash/launcher/launcher_model.h"

+#include "ash/shelf/shelf_model.h"

#include "ash/shelf/shelf_model_util.h"

#include "ash/shell.h"

#include "ash/wm/window_util.h"

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

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

return;

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

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

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

int browser_index =