Chromium Code Reviews| Index: content/renderer/favicon_helper.h |
| diff --git a/chrome/renderer/favicon_helper.h b/content/renderer/favicon_helper.h |
| similarity index 85% |
| rename from chrome/renderer/favicon_helper.h |
| rename to content/renderer/favicon_helper.h |
| index aeccd28a804497a88616f41d2a6898aa9a764579..ab9c87b60a8ba521869c9b5387e899e8c605d53c 100644 |
| --- a/chrome/renderer/favicon_helper.h |
| +++ b/content/renderer/favicon_helper.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CHROME_RENDERER_FAVICON_HELPER_H_ |
| -#define CHROME_RENDERER_FAVICON_HELPER_H_ |
| +#ifndef CONTENT_RENDERER_FAVICON_HELPER_H_ |
| +#define CONTENT_RENDERER_FAVICON_HELPER_H_ |
| #include <string> |
| #include <vector> |
| @@ -13,18 +13,25 @@ |
| #include "content/public/renderer/render_view_observer.h" |
| #include "googleurl/src/gurl.h" |
| -struct FaviconURL; |
| class SkBitmap; |
| +namespace content { |
| +struct FaviconURL; |
| +} |
| + |
| namespace webkit_glue { |
| class MultiResolutionImageResourceFetcher; |
| } |
| +namespace content { |
| + |
| +struct FaviconURL; |
| + |
| // This class deals with favicon downloading. |
| // There is one FaviconHelper per RenderView, which is owned by the RenderView. |
| -class FaviconHelper : public content::RenderViewObserver { |
| +class FaviconHelper : public RenderViewObserver { |
| public: |
| - explicit FaviconHelper(content::RenderView* render_view); |
| + explicit FaviconHelper(RenderView* render_view); |
| private: |
| virtual ~FaviconHelper(); |
| @@ -55,7 +62,7 @@ class FaviconHelper : public content::RenderViewObserver { |
| // Send a message to update the favicon URL for a page. |
| void SendUpdateFaviconURL(int32 routing_id, |
| int32 page_id, |
| - const std::vector<FaviconURL>& urls); |
| + const std::vector<content::FaviconURL>& urls); |
|
jam
2012/11/27 01:16:31
nit: get rid of "content::"
Cait (Slow)
2012/11/28 00:11:45
Done.
|
| // RenderViewObserver implementation. |
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| @@ -72,4 +79,6 @@ class FaviconHelper : public content::RenderViewObserver { |
| DISALLOW_COPY_AND_ASSIGN(FaviconHelper); |
| }; |
| -#endif // CHROME_RENDERER_FAVICON_HELPER_H_ |
| +} // namespace content |
| + |
| +#endif // CONTENT_RENDERER_FAVICON_HELPER_H_ |