| Index: chrome/browser/ui/search/instant_tab.h
|
| diff --git a/chrome/browser/ui/search/instant_page.h b/chrome/browser/ui/search/instant_tab.h
|
| similarity index 76%
|
| rename from chrome/browser/ui/search/instant_page.h
|
| rename to chrome/browser/ui/search/instant_tab.h
|
| index 23b6cb1fb4e640fb42d28d5b788631e740f70465..c77f21cfb882d71615bf816e3c76d69361468b59 100644
|
| --- a/chrome/browser/ui/search/instant_page.h
|
| +++ b/chrome/browser/ui/search/instant_tab.h
|
| @@ -2,8 +2,8 @@
|
| // 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_
|
| +#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
|
| +#define CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| @@ -19,12 +19,12 @@ class RenderFrameHost;
|
| class WebContents;
|
| }
|
|
|
| -// InstantPage is used to exchange messages with a page that implements the
|
| +// InstantTab is used to exchange messages with a page that implements the
|
| // Instant/Embedded Search API (http://dev.chromium.org/embeddedsearch).
|
| -class InstantPage : public content::WebContentsObserver,
|
| +class InstantTab : public content::WebContentsObserver,
|
| public SearchModelObserver {
|
| public:
|
| - // InstantPage calls its delegate in response to messages received from the
|
| + // InstantTab 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 {
|
| @@ -35,7 +35,7 @@ class InstantPage : public content::WebContentsObserver,
|
| bool supports_instant) = 0;
|
|
|
| // Called when the page is about to navigate to |url|.
|
| - virtual void InstantPageAboutToNavigateMainFrame(
|
| + virtual void InstantTabAboutToNavigateMainFrame(
|
| const content::WebContents* contents,
|
| const GURL& url) = 0;
|
|
|
| @@ -43,9 +43,9 @@ class InstantPage : public content::WebContentsObserver,
|
| virtual ~Delegate();
|
| };
|
|
|
| - explicit InstantPage(Delegate* delegate);
|
| + explicit InstantTab(Delegate* delegate);
|
|
|
| - ~InstantPage() override;
|
| + ~InstantTab() override;
|
|
|
| // Sets |web_contents| as the page to communicate with. |web_contents| may be
|
| // NULL, which effectively stops all communication.
|
| @@ -62,14 +62,14 @@ class InstantPage : public content::WebContentsObserver,
|
| bool IsLocal() const;
|
|
|
| private:
|
| - FRIEND_TEST_ALL_PREFIXES(InstantPageTest, IsLocal);
|
| - FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
|
| + FRIEND_TEST_ALL_PREFIXES(InstantTabTest, IsLocal);
|
| + FRIEND_TEST_ALL_PREFIXES(InstantTabTest,
|
| DetermineIfPageSupportsInstant_Local);
|
| - FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
|
| + FRIEND_TEST_ALL_PREFIXES(InstantTabTest,
|
| DetermineIfPageSupportsInstant_NonLocal);
|
| - FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
|
| + FRIEND_TEST_ALL_PREFIXES(InstantTabTest,
|
| PageURLDoesntBelongToInstantRenderer);
|
| - FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant);
|
| + FRIEND_TEST_ALL_PREFIXES(InstantTabTest, PageSupportsInstant);
|
|
|
| // Overridden from content::WebContentsObserver:
|
| void DidCommitProvisionalLoadForFrame(
|
| @@ -88,7 +88,7 @@ class InstantPage : public content::WebContentsObserver,
|
|
|
| Delegate* const delegate_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(InstantPage);
|
| + DISALLOW_COPY_AND_ASSIGN(InstantTab);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
|
| +#endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TAB_H_
|
|
|