Index: chrome/renderer/favicon_helper.cc |
diff --git a/chrome/renderer/favicon_helper.cc b/chrome/renderer/favicon_helper.cc |
index 8df4839af873e75cd68422073a3a0bc33416c9e2..f9cf83102a94c496c19498387ffc515e45b1d60b 100644 |
--- a/chrome/renderer/favicon_helper.cc |
+++ b/chrome/renderer/favicon_helper.cc |
@@ -7,14 +7,14 @@ |
#include "base/bind.h" |
#include "base/message_loop.h" |
#include "chrome/common/chrome_constants.h" |
-#include "chrome/common/favicon_url.h" |
#include "chrome/common/icon_messages.h" |
+#include "content/public/common/favicon_url.h" |
#include "content/public/renderer/render_view.h" |
#include "net/base/data_url.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
#include "ui/gfx/favicon_size.h" |
#include "ui/gfx/size.h" |
#include "ui/gfx/skbitmap_operations.h" |
@@ -22,6 +22,7 @@ |
#include "webkit/glue/multi_resolution_image_resource_fetcher.h" |
#include "webkit/glue/webkit_glue.h" |
+using content::FaviconURL; |
using WebKit::WebFrame; |
using WebKit::WebIconURL; |
using WebKit::WebVector; |