diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-03-30 10:17:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-30 17:18:00 +0000 |
| commit | 494aec68691f10626b226892396d442503dd9af7 (patch) | |
| tree | 3cf53649ec6e4c708d419928ca798b5bc6641dee /chrome/browser/android/tab_android.h | |
| parent | 24c5e71f6cc5f1033485d83bd7d767c45071cf16 (diff) | |
| download | chromium_src-494aec68691f10626b226892396d442503dd9af7.zip chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.gz chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.bz2 | |
Move //components/favicon code into the favicon namespace
Move all classes defined in //components/favicon into the favicon namespace
and update all client code forward-declaration and usage.
Rename FaviconTabHelperObserver to FaviconDriverObserver as FaviconDriver is
the name of the base interface (and iOS wants to use that observer but will
not be able to use FaviconTabHelper).
BUG=359513
Review URL: https://codereview.chromium.org/1028503004
Cr-Commit-Position: refs/heads/master@{#322799}
Diffstat (limited to 'chrome/browser/android/tab_android.h')
| -rw-r--r-- | chrome/browser/android/tab_android.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h index 0de4f1f..af89b58 100644 --- a/chrome/browser/android/tab_android.h +++ b/chrome/browser/android/tab_android.h @@ -16,7 +16,7 @@ #include "chrome/browser/ui/search/search_tab_helper_delegate.h" #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "components/favicon/core/favicon_tab_helper_observer.h" +#include "components/favicon/core/favicon_driver_observer.h" #include "components/sessions/session_id.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -53,7 +53,7 @@ class TabAndroid : public CoreTabHelperDelegate, public InstantServiceObserver, public SearchTabHelperDelegate, public content::NotificationObserver, - public FaviconTabHelperObserver { + public favicon::FaviconDriverObserver { public: // A Java counterpart will be generated for this enum. // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser @@ -137,7 +137,7 @@ class TabAndroid : public CoreTabHelperDelegate, const content::NotificationSource& source, const content::NotificationDetails& details) override; - // FaviconTabHelperObserver ----------------------------------------------- + // favicon::FaviconDriverObserver ------------------------------------------- void OnFaviconAvailable(const gfx::Image& image) override; // Methods called from Java via JNI ----------------------------------------- |