Merge InstantTag into InstantPage.

chrome/browser/ui/search/instant_page.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/base/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 class RenderFrameHost;
 class WebContents;
 }
 
 // InstantPage is used to exchange messages with a page that implements the
 // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
-// InstantPage is not used directly but via its derived class, InstantTab.
 class InstantPage : public content::WebContentsObserver,
                     public SearchModelObserver {
  public:
   // InstantPage calls its delegate in response to messages received from the
   // page. Each method is called with the |contents| corresponding to the page
   // we are observing.
   class Delegate {
    public:
     // Called upon determination of Instant API support. Either in response to
     // the page loading or because we received some other message.
     virtual void InstantSupportDetermined(const content::WebContents* contents,
                                           bool supports_instant) = 0;
 
     // Called when the page is about to navigate to |url|.
     virtual void InstantPageAboutToNavigateMainFrame(
         const content::WebContents* contents,
         const GURL& url) = 0;
 
    protected:
     virtual ~Delegate();
   };
 
+  explicit InstantPage(Delegate* delegate);
+
   ~InstantPage() override;
 
+  // Sets |web_contents| as the page to communicate with. |web_contents| may be
+  // NULL, which effectively stops all communication.
+  void Init(content::WebContents* web_contents);
+
   // Returns true if the page is known to support the Instant API. This starts
   // out false, and is set to true whenever we get any message from the page.
   // Once true, it never becomes false (the page isn't expected to drop API
   // support suddenly).
   bool supports_instant() const;
 
   // Returns true if the page is the local NTP (i.e. its URL is
   // chrome::kChromeSearchLocalNTPURL).
   bool IsLocal() const;
 
- protected:
-  explicit InstantPage(Delegate* delegate);
-
-  // Sets |web_contents| as the page to communicate with. |web_contents| may be
-  // NULL, which effectively stops all communication.
-  void SetContents(content::WebContents* web_contents);
-
-  Delegate* delegate() const { return delegate_; }
-
-  // This method is called before processing messages received from the page.
-  virtual bool ShouldProcessAboutToNavigateMainFrame();
-
  private:
   FRIEND_TEST_ALL_PREFIXES(InstantPageTest, IsLocal);
   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);
 
@@ skipping 11 matching lines @@
   void InstantSupportDetermined(bool supports_instant);
 
   void ClearContents();
 
   Delegate* const delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantPage);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_