summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 05:05:37 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 05:05:37 +0000
commit2031cf9d2ebb778b9a2f76aa089a3c96ae91db72 (patch)
treeb1f7a90f01c76af8e8502f189925957d89734fe8 /chrome/browser/browser.h
parentc976938f96f5f9296d25cbc41d8fcea5bce74627 (diff)
downloadchromium_src-2031cf9d2ebb778b9a2f76aa089a3c96ae91db72.zip
chromium_src-2031cf9d2ebb778b9a2f76aa089a3c96ae91db72.tar.gz
chromium_src-2031cf9d2ebb778b9a2f76aa089a3c96ae91db72.tar.bz2
Moves instant out of labs and into prefs.
BUG=58772 TEST=make sure that there is an entry in prefs for instant. See that it works. Review URL: http://codereview.chromium.org/3726002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
-rw-r--r--chrome/browser/browser.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index a6e2f22..d491f68 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -975,6 +975,9 @@ class Browser : public TabHandlerDelegate,
// for use from OpenCurrentURL.
bool OpenInstant(WindowOpenDisposition disposition);
+ // If this browser should have instant one is created, otherwise does nothing.
+ void CreateInstantIfNecessary();
+
// Data members /////////////////////////////////////////////////////////////
NotificationRegistrar registrar_;
@@ -1072,6 +1075,9 @@ class Browser : public TabHandlerDelegate,
// Keep track of the printing enabled pref.
BooleanPrefMember printing_enabled_;
+ // Keep track of when instant enabled changes.
+ BooleanPrefMember instant_enabled_;
+
// Indicates if command execution is blocked.
bool block_command_execution_;