Chromium Code Reviews| 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 4cad6a740c7b75539e3145e7940f5f3827046072..10e421de5a3cda7f573b053594cb5af65999d5e0 100644 |
| --- a/chrome/browser/ui/search/search_tab_helper.h |
| +++ b/chrome/browser/ui/search/search_tab_helper.h |
| @@ -41,11 +41,6 @@ class SearchTabHelper : public content::WebContentsObserver, |
| // affect the search mode. |
| void OmniboxEditModelChanged(OmniboxEditModel* edit_model); |
| - // content::WebContentsObserver overrides: |
| - 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, |
| @@ -53,7 +48,8 @@ class SearchTabHelper : public content::WebContentsObserver, |
| private: |
| // Sets the mode of the model based on |url|. |
| - void UpdateModel(const GURL& url); |
| + // |animate| is flag in model's mode. |
| + void UpdateModel(const GURL& url, bool animate); |
| // On navigation away from NTP and Search pages, delete |ntp_web_contents_|. |
| void FlushNTP(const GURL& url); |
| @@ -66,6 +62,9 @@ class SearchTabHelper : public content::WebContentsObserver, |
| // Lazily created web contents for NTP. |
| scoped_ptr<content::WebContents> ntp_web_contents_; |
| + // True if at least one navigation entry has been committed. |
| + bool has_navigated_; |
|
dhollowa
2012/08/02 22:35:38
Can you remove this in favor of |NavigationControl
kuan
2012/08/03 04:55:58
IsInitialNavigation is already false by the time w
kuan
2012/08/03 04:59:42
sorry, typo, i mean: "i cld use it previously 'cos
|
| + |
| content::NotificationRegistrar registrar_; |
| DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); |