| Index: chrome/browser/favicon/favicon_tab_helper.h
|
| diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
|
| index 4dac6874a0a5354c38625c9765619e8ccf6cff49..f5dc53f80899beb1cd25dc3995b3d7c45f89c0e5 100644
|
| --- a/chrome/browser/favicon/favicon_tab_helper.h
|
| +++ b/chrome/browser/favicon/favicon_tab_helper.h
|
| @@ -12,9 +12,9 @@
|
| #include "chrome/browser/favicon/favicon_download_helper_delegate.h"
|
| #include "chrome/browser/favicon/favicon_handler_delegate.h"
|
| #include "chrome/browser/history/history_types.h"
|
| -#include "chrome/common/favicon_url.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_user_data.h"
|
| +#include "content/public/common/favicon_url.h"
|
|
|
| namespace gfx {
|
| class Image;
|
| @@ -59,7 +59,7 @@ class FaviconTabHelper : public content::WebContentsObserver,
|
| // PrerenderContents.
|
| virtual void OnUpdateFaviconURL(
|
| int32 page_id,
|
| - const std::vector<FaviconURL>& candidates) OVERRIDE;
|
| + const std::vector<content::FaviconURL>& candidates) OVERRIDE;
|
|
|
| // Saves the favicon for the current page.
|
| void SaveFavicon();
|
|
|