summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fav_icon_helper.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 04:53:51 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 04:53:51 +0000
commit2255d61195136acb02d4b6a1e4b70977975ee716 (patch)
tree39b968c9a5b47663959bebd4f3f7ddab2f5964e5 /chrome/browser/fav_icon_helper.cc
parent3d8e12e127b79f0692eac331c16bed3c1cee967e (diff)
downloadchromium_src-2255d61195136acb02d4b6a1e4b70977975ee716.zip
chromium_src-2255d61195136acb02d4b6a1e4b70977975ee716.tar.gz
chromium_src-2255d61195136acb02d4b6a1e4b70977975ee716.tar.bz2
Make fav_icon_helper compile on POSIX, remove some unneeded #includes.
Review URL: http://codereview.chromium.org/20286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.cc')
-rwxr-xr-xchrome/browser/fav_icon_helper.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index cd6808b..a35868d 100755
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -4,16 +4,23 @@
#include "chrome/browser/fav_icon_helper.h"
+#include "build/build_config.h"
+
#include "base/gfx/png_decoder.h"
#include "base/gfx/png_encoder.h"
#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/navigation_entry.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),
@@ -258,4 +265,3 @@ SkBitmap FavIconHelper::ConvertToFavIconSize(const SkBitmap& image) {
}
return image;
}
-