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

Unified Diff: chrome/browser/ui/cocoa/tabpose_window.mm

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
Index: chrome/browser/ui/cocoa/tabpose_window.mm
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index 056519ab0c0fcd8f676c432daf3b86c62a397b17..7bd20f11229d5b381f5da79baec34b46343a5699 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -457,8 +457,10 @@ NSRect Tile::GetFaviconStartRectRelativeTo(const Tile& tile) const {
}
NSImage* Tile::favicon() const {
- if (contents_->extension_tab_helper()->is_app()) {
- SkBitmap* bitmap = contents_->extension_tab_helper()->GetExtensionAppIcon();
+ extensions::TabHelper* extensions_tab_helper =
+ extensions::TabHelper::FromWebContents(contents_->web_contents());
+ if (extensions_tab_helper->is_app()) {
+ SkBitmap* bitmap = extensions_tab_helper->GetExtensionAppIcon();
if (bitmap)
return gfx::SkBitmapToNSImage(*bitmap);
}
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698