Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: chrome/browser/ui/search/search_tab_helper.h

Issue 10816027: alternate ntp: toolbar background and separator animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address dhollowa's comments Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
sky 2012/08/03 22:18:41 |animate| is set in the Mode passed to the model.
kuan 2012/08/13 20:19:46 Done.
+ 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_;
sky 2012/08/03 17:29:40 Can you query the navigation stack rather than mai
kuan 2012/08/03 17:46:49 Initially, when we would update mode in NavigateTo
kuan 2012/08/13 20:19:46 i've reverted to use NavigateToPendingEntry and Na
+
content::NotificationRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);

Powered by Google App Engine
This is Rietveld 408576698