chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc - Issue 17673004: Insert panel icons on the left of other panel icons.

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

Issue 17673004: Insert panel icons on the left of other panel icons. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix test assertions. Created 7 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/launcher/launcher_model.cc ('K') | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3425019e5c62d0fb5da37b6a2fe0eefdc7be9f65..2e65b207497d27b34ce0b1c7642834f4413b2624 100644

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

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

@@ -329,7 +329,7 @@ ash::LauncherID ChromeLauncherControllerPerApp::CreateAppLauncherItem(

return InsertAppLauncherItem(controller,

app_id,

status,

- model_->item_count(),

+ ash::LauncherModel::kAutomaticIndex,

controller->GetLauncherItemType());

}

@@ -459,7 +459,7 @@ void ChromeLauncherControllerPerApp::LockV1AppWithID(

ash::LauncherID id = GetLauncherIDForAppID(app_id);

if (!IsPinned(id) && !IsWindowedAppInLauncher(app_id)) {

CreateAppShortcutLauncherItemWithType(app_id,

- model_->item_count(),

+ ash::LauncherModel::kAutomaticIndex,

ash::TYPE_WINDOWED_APP);

id = GetLauncherIDForAppID(app_id);

}

@@ -1341,7 +1341,7 @@ void ChromeLauncherControllerPerApp::DoPinAppWithID(

Pin(launcher_id);

} else {

// Otherwise, create a shortcut item for it.

- CreateAppShortcutLauncherItem(app_id, model_->item_count());

+ CreateAppShortcutLauncherItem(app_id, ash::LauncherModel::kAutomaticIndex);

if (CanPin())

PersistPinnedState();

}