chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc - Issue 13139004: Deprecate Browser::TYPE_PANEL

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

Issue 13139004: Deprecate Browser::TYPE_PANEL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 9 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc ('k') | chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc » ('j') | chrome/browser/ui/uma_browsing_activity_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 78c7d148ff1748103fcaf19f7a386f767e2339fd..b3ac41a768eafc36f2c78de52a5edf16c6f3cc7e 100644

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

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

@@ -622,13 +622,6 @@ void ChromeLauncherControllerPerBrowser::SetAppImage(

if (i->second->app_id() != id)

continue;

- // Panel items may share the same app_id as the app that created them,

- // but they set their icon image in

- // BrowserLauncherItemController::UpdateLauncher(), so do not set panel

- // images here.

- if (i->second->type() == LauncherItemController::TYPE_EXTENSION_PANEL)

- continue;

int index = model_->ItemIndexByID(i->first);

ash::LauncherItem item = model_->items()[index];

item.image = image;

@@ -1307,8 +1300,7 @@ ash::LauncherID ChromeLauncherControllerPerBrowser::InsertAppLauncherItem(

model_->AddAt(index, item);

- if (controller->type() != LauncherItemController::TYPE_EXTENSION_PANEL)

- app_icon_loader_->FetchImage(app_id);

+ app_icon_loader_->FetchImage(app_id);

return id;

}