diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:39:00 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 19:39:00 +0000 |
| commit | 4ff347ea9370c97d4a39ee4eaca6615e03837e76 (patch) | |
| tree | bbe2c330c8b502337a065b222f0b74312a09b720 /chrome/browser/ui/browser_instant_controller.h | |
| parent | 4d049450f2cd8b761aab4b1c5bdd7a497178d2db (diff) | |
| download | chromium_src-4ff347ea9370c97d4a39ee4eaca6615e03837e76.zip chromium_src-4ff347ea9370c97d4a39ee4eaca6615e03837e76.tar.gz chromium_src-4ff347ea9370c97d4a39ee4eaca6615e03837e76.tar.bz2 | |
Only cache one InstantNTP WebContents per profile for Instant.
Previously, we had one InstantNTP WebContents per browser window.
In this CL,
(1) Moved InstantNTP related code from InstantController to InstantNTPPrerenderer.
(2) InstantNTPPrerenderer preloads and releases InstantNTP WebContents.
(3) InstantService owns InstantNTPPrerenderer.
(4) We will preload only one InstantNTP per profile.
(5) InstantController no longer maintains InstantNTP.
(6) Removed an unused param from InstantLoader::Init().
BUG=231660,257079
TEST=none
Review URL: https://chromiumcodereview.appspot.com/18248003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.h')
| -rw-r--r-- | chrome/browser/ui/browser_instant_controller.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h index 6f2a025..0d99aaa 100644 --- a/chrome/browser/ui/browser_instant_controller.h +++ b/chrome/browser/ui/browser_instant_controller.h @@ -13,7 +13,6 @@ #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/browser/ui/search/instant_unload_handler.h" #include "chrome/browser/ui/search/search_model_observer.h" -#include "net/base/network_change_notifier.h" #include "ui/base/window_open_disposition.h" class Browser; @@ -28,9 +27,7 @@ namespace gfx { class Rect; } -class BrowserInstantController - : public SearchModelObserver, - public net::NetworkChangeNotifier::NetworkChangeObserver { +class BrowserInstantController : public SearchModelObserver { public: explicit BrowserInstantController(Browser* browser); virtual ~BrowserInstantController(); @@ -83,10 +80,6 @@ class BrowserInstantController void ToggleVoiceSearch(); private: - // Sets the value of |instant_| based on value from profile. Invoked - // on pref change. - void ResetInstant(const std::string& pref_name); - // Overridden from search::SearchModelObserver: virtual void ModelChanged(const SearchModel::State& old_state, const SearchModel::State& new_state) OVERRIDE; @@ -97,10 +90,6 @@ class BrowserInstantController // ensures that they are reloaded in a non-privileged renderer process. void OnDefaultSearchProviderChanged(const std::string& pref_name); - // Overridden from net::NetworkChangeNotifier::NetworkChangeObserver: - virtual void OnNetworkChanged(net::NetworkChangeNotifier::ConnectionType type) - OVERRIDE; - // Replaces the contents at tab |index| with |new_contents| and deletes the // existing contents. void ReplaceWebContentsAt(int index, |