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

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

Issue 16035020: Move instant support to SearchTabHelper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 7 years, 6 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 8dd771100bd814bded3345f691479189a6b21cb2..cf1fbd48dd8e1d448b96e28e58545936a6a1b3eb 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
#include "chrome/browser/ui/search/search_model.h"
#include "chrome/common/instant_types.h"
#include "content/public/browser/notification_observer.h"
@@ -20,6 +21,8 @@ namespace content {
class WebContents;
}
+class InstantPageTest;
+
// Per-tab search "helper". Acts as the owner and controller of the tab's
// search UI model.
class SearchTabHelper : public content::NotificationObserver,
@@ -50,8 +53,23 @@ class SearchTabHelper : public content::NotificationObserver,
bool UpdateLastKnownMostVisitedItems(
const std::vector<InstantMostVisitedItem>& items);
+ // Invoked to update the instant support state.
+ void InstantSupportChanged(bool supports_instant);
+
+ // Returns true if the page supports instant. If the instant support state is
+ // not determined or if the page does not support instant returns false.
+ bool SupportsInstant() const;
+
private:
friend class content::WebContentsUserData<SearchTabHelper>;
+ friend class InstantPageTest;
+ FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+ DetermineIfPageSupportsInstant_Local);
+ FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+ DetermineIfPageSupportsInstant_NonLocal);
+ FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
+ PageURLDoesntBelongToInstantRenderer);
+ FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant);
explicit SearchTabHelper(content::WebContents* web_contents);
@@ -62,10 +80,23 @@ class SearchTabHelper : public content::NotificationObserver,
// Overridden from contents::WebContentsObserver:
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ virtual void DidFinishLoad(
+ int64 frame_id,
+ const GURL& validated_url,
+ bool is_main_frame,
+ content::RenderViewHost* render_view_host) OVERRIDE;
// Sets the mode of the model based on the current URL of web_contents().
void UpdateMode();
+ // Tells the renderer to determine if the page supports the Instant API, which
+ // results in a call to OnInstantSupportDetermined() when the reply
+ // is received.
+ void DetermineIfPageSupportsInstant();
+
+ // Handler for when Instant support has been determined.
+ void OnInstantSupportDetermined(int page_id, bool supports_instant);
+
// Handlers for SearchBox API to show and hide top bars (bookmark and info
// bars).
void OnSearchBoxShowBars(int page_id);
@@ -89,6 +120,10 @@ class SearchTabHelper : public content::NotificationObserver,
// Used to prevent sending duplicate IPC messages to the renderer.
std::vector<InstantMostVisitedItem> last_known_most_visited_items_;
+ // Set to true if a request is dispatched to the renderer to determine the
+ // instant support state.
+ bool instant_support_request_in_progress_;
+
DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
};

Powered by Google App Engine
This is Rietveld 408576698