Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

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
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 d690b8dad1f97cd63355a5cc909721b867d2fba9..d7e6df450260b19d616cee7db9da9edbc6e6a608 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
@@ -629,13 +629,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;
@@ -1343,8 +1336,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;
}

Powered by Google App Engine
This is Rietveld 408576698