ash/shell.cc - Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems...

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: ash/shell.cc

Issue 152223002: Renames LauncherID, LauncherItem and LauncherItems... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: OWNERS Created 6 years, 11 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:

Index: ash/shell.cc

diff --git a/ash/shell.cc b/ash/shell.cc

index 5b7fb0cd25108f90484d22217ef639a0e825fea3..986612e3a67ce97e60826a8f5e988d4327b9bd43 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -529,7 +529,7 @@ ShelfDelegate* Shell::GetShelfDelegate() {

// ShelfItemDelegate.

int app_list_index = shelf_model_->GetItemIndexForType(TYPE_APP_LIST);

DCHECK_GE(app_list_index, 0);

- LauncherID app_list_id = shelf_model_->items()[app_list_index].id;

+ ShelfID app_list_id = shelf_model_->items()[app_list_index].id;

DCHECK(app_list_id);

shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id,

controller.Pass());

« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell/app_list.cc » ('j') | no next file with comments »