summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fav_icon_helper.cc
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-17 22:13:19 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-17 22:13:19 +0000
commita239c3f7a4dbf736b6b5dce686619819f6c86f18 (patch)
tree081722636f668bb0198713a788be349bc940c6b1 /chrome/browser/fav_icon_helper.cc
parent41528efa2a2fd9e199f422dffd64c95518adc838 (diff)
downloadchromium_src-a239c3f7a4dbf736b6b5dce686619819f6c86f18.zip
chromium_src-a239c3f7a4dbf736b6b5dce686619819f6c86f18.tar.gz
chromium_src-a239c3f7a4dbf736b6b5dce686619819f6c86f18.tar.bz2
Remove TabContentsDelegate from scaffolding. Remove a large chunk of ifdef'd code from browser.cc to go along with it as well as enabling more functionality.
Review URL: http://codereview.chromium.org/21424 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.cc')
-rw-r--r--chrome/browser/fav_icon_helper.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index a35868d..3b23e3b 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -11,16 +11,11 @@
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/common/gfx/favicon_size.h"
#include "skia/ext/image_operations.h"
-#if defined(OS_WIN)
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#elif defined(OS_POSIX)
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
FavIconHelper::FavIconHelper(WebContents* web_contents)
: web_contents_(web_contents),
got_fav_icon_url_(false),