| Index: chrome/browser/ui/search/search.h
|
| diff --git a/chrome/browser/ui/search/search.h b/chrome/browser/ui/search/search.h
|
| index d7364b74e38501a170cda9738853e06223504ff7..a3874ea85f02ce4219638549eb05f4aaa2a7be8a 100644
|
| --- a/chrome/browser/ui/search/search.h
|
| +++ b/chrome/browser/ui/search/search.h
|
| @@ -17,6 +17,16 @@ class Profile;
|
| namespace chrome {
|
| namespace search {
|
|
|
| +enum InstantExtendedDefault {
|
| + INSTANT_FORCE_ON, // Force the setting on if no other setting exists.
|
| + INSTANT_USE_EXISTING, // Use same the value of the old instant.enabled pref.
|
| + INSTANT_FORCE_OFF, // Force the setting off if no other setting exists.
|
| +};
|
| +
|
| +// Returns an enum value indicating which mode to set the new
|
| +// instant_extended.enabled pref to by default.
|
| +InstantExtendedDefault GetInstantExtendedDefaultSetting();
|
| +
|
| // Returns whether the Instant extended API is enabled for the given |profile|.
|
| // |profile| may not be NULL.
|
| bool IsInstantExtendedAPIEnabled(Profile* profile);
|
| @@ -45,9 +55,13 @@ bool IsForcedInstantURL(const GURL& url);
|
| typedef std::vector<std::pair<std::string, std::string> > FieldTrialFlags;
|
|
|
| // Given a field trial group name, parses out the group number and configuration
|
| -// flags.
|
| +// flags. On success, |flags| will be filled with the field trial flags. |flags|
|
| +// must not be NULL. If not NULL, |group_number| will receive the experiment
|
| +// group number.
|
| +// Returns true iff field trial info was successfully parsed out of
|
| +// |group_name|.
|
| // Exposed for testing only.
|
| -void GetFieldTrialInfo(const std::string& group_name,
|
| +bool GetFieldTrialInfo(const std::string& group_name,
|
| FieldTrialFlags* flags,
|
| uint64* group_number);
|
|
|
|
|