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

Unified Diff: chrome/renderer/favicon_helper.cc

Issue 11416179: Move chrome/common/favicon_url.(cc|h) into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/renderer/favicon_helper.h ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/renderer/favicon_helper.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698