Use the "DNS prefetch" button to control whether prerender is enabled/disabled.

This also removes prerender from about:flags.

BUG=77783
TEST=Force prerender on [via --prerender=enabled] and toggle the checkbox on/off to dynamically adjust prerender.

Review URL: http://codereview.chromium.org/6771018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79986 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 1 deletions

diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index a1fd2bd..3c33c16 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -12,12 +12,21 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/common/notification_observer.h"
 
+class Profile;
+
+namespace prerender {
+class PrerenderManager;
+}
+
 // Monitors network-related preferences for changes and applies them.
 // The supplied PrefService must outlive this NetPrefObserver.
 // Must be used only on the UI thread.
 class NetPrefObserver : public NotificationObserver {
  public:
-  explicit NetPrefObserver(PrefService* prefs);
+  // |prefs| must outlive this NetPrefObserver. A reference is
+  // held to |prerender_manager| if it is non-NULL.
+  NetPrefObserver(PrefService* prefs,
+                  prerender::PrerenderManager* prerender_manager);
   ~NetPrefObserver();
 
   // NotificationObserver
@@ -34,6 +43,7 @@ class NetPrefObserver : public NotificationObserver {
   BooleanPrefMember dns_prefetching_enabled_;
   BooleanPrefMember spdy_disabled_;
   BooleanPrefMember http_throttling_enabled_;
+  scoped_refptr<prerender::PrerenderManager> prerender_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(NetPrefObserver);
 };