| Index: chrome/browser/ui/search/search_tab_helper.h
|
| diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
|
| index db57c4e8258502713e7a34ba95c1dcc9162309d4..114cc6698e09c19ad52872364d69254142691f6e 100644
|
| --- a/chrome/browser/ui/search/search_tab_helper.h
|
| +++ b/chrome/browser/ui/search/search_tab_helper.h
|
| @@ -9,7 +9,6 @@
|
| #include "chrome/browser/ui/search/search_model.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| -#include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_user_data.h"
|
|
|
| class OmniboxEditModel;
|
| @@ -23,8 +22,7 @@ namespace search {
|
|
|
| // Per-tab search "helper". Acts as the owner and controller of the tab's
|
| // search UI model.
|
| -class SearchTabHelper : public content::WebContentsObserver,
|
| - public content::NotificationObserver,
|
| +class SearchTabHelper : public content::NotificationObserver,
|
| public content::WebContentsUserData<SearchTabHelper> {
|
| public:
|
| virtual ~SearchTabHelper();
|
| @@ -43,11 +41,6 @@ class SearchTabHelper : public content::WebContentsObserver,
|
| // the notification system and shouldn't call this method.
|
| void NavigationEntryUpdated();
|
|
|
| - // Overridden from contents::WebContentsObserver:
|
| - virtual void NavigateToPendingEntry(
|
| - const GURL& url,
|
| - content::NavigationController::ReloadType reload_type) OVERRIDE;
|
| -
|
| // Overridden from content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
|
|