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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm

Issue 11305008: Remove TabContents from TabStripModelObserverBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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/cocoa/tab_contents/favicon_util_mac.h ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
index 719a60245526601ed35c5cc29c805897048d6433..16fd648b94d6b5bfd21b9ebbdc8fa2bbab554c13 100644
--- a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm
@@ -5,15 +5,14 @@
#include "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
namespace mac {
-NSImage* FaviconForTabContents(TabContents* contents) {
+NSImage* FaviconForWebContents(content::WebContents* contents) {
FaviconTabHelper* favicon_tab_helper =
- contents ? FaviconTabHelper::FromWebContents(contents->web_contents())
+ contents ? FaviconTabHelper::FromWebContents(contents)
: NULL;
if (favicon_tab_helper && favicon_tab_helper->FaviconIsValid()) {
NSImage* image = favicon_tab_helper->GetFavicon().AsNSImage();
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h ('k') | chrome/browser/ui/cocoa/tabpose_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698