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

Unified Diff: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc

Issue 10917026: Switch Extensions::TabHelper to use WebContents, WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 8 years, 3 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/sync/glue/session_change_processor.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
index a9268914ca9efbed3c762b600f49eee1e321c370..453df2a1aad006625364a94164f8c9023b4ec9b7 100644
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
@@ -251,11 +251,11 @@ void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {
new LauncherFaviconLoader(this, tab->web_contents()));
}
// Update the icon for extension panels.
+ extensions::TabHelper* extensions_tab_helper =
+ extensions::TabHelper::FromWebContents(tab->web_contents());
SkBitmap new_image = favicon_loader_->GetFavicon();
- if (new_image.isNull() &&
- tab->extension_tab_helper()->GetExtensionAppIcon()) {
- new_image = *tab->extension_tab_helper()->GetExtensionAppIcon();
- }
+ if (new_image.isNull() && extensions_tab_helper->GetExtensionAppIcon())
+ new_image = *extensions_tab_helper->GetExtensionAppIcon();
// Only update the icon if we have a new image, or none has been set yet.
// This avoids flickering to an empty image when a pinned app is opened.
if (!new_image.isNull())
« no previous file with comments | « chrome/browser/sync/glue/session_change_processor.cc ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698