Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(773)

Side by Side Diff: chrome/common/pref_names.cc

Issue 160053004: Add user preferences for Contextual Search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change from an integer to a string. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "chrome/common/pref_font_webkit_names.h" 8 #include "chrome/common/pref_font_webkit_names.h"
9 9
10 namespace prefs { 10 namespace prefs {
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 // Enum that specifies whether Incognito mode is: 346 // Enum that specifies whether Incognito mode is:
347 // 0 - Enabled. Default behaviour. Default mode is available on demand. 347 // 0 - Enabled. Default behaviour. Default mode is available on demand.
348 // 1 - Disabled. Used cannot browse pages in Incognito mode. 348 // 1 - Disabled. Used cannot browse pages in Incognito mode.
349 // 2 - Forced. All pages/sessions are forced into Incognito. 349 // 2 - Forced. All pages/sessions are forced into Incognito.
350 const char kIncognitoModeAvailability[] = "incognito.mode_availability"; 350 const char kIncognitoModeAvailability[] = "incognito.mode_availability";
351 351
352 // Boolean that is true when Suggest support is enabled. 352 // Boolean that is true when Suggest support is enabled.
353 const char kSearchSuggestEnabled[] = "search.suggest_enabled"; 353 const char kSearchSuggestEnabled[] = "search.suggest_enabled";
354 354
355 #if defined(OS_ANDROID) 355 #if defined(OS_ANDROID)
356 // Integer indicating the Contextual Search enabled state. 356 // A string pref set to indicate contextual search enabled status.
357 // -1 - opt-out (disabled)
358 // 0 - undecided
359 // 1 - opt-in (enabled)
360 const char kContextualSearchEnabled[] = "search.contextual_search_enabled"; 357 const char kContextualSearchEnabled[] = "search.contextual_search_enabled";
361 #endif 358 #endif
362 359
363 // Boolean that indicates whether the browser should put up a confirmation 360 // Boolean that indicates whether the browser should put up a confirmation
364 // window when the user is attempting to quit. Mac only. 361 // window when the user is attempting to quit. Mac only.
365 const char kConfirmToQuitEnabled[] = "browser.confirm_to_quit"; 362 const char kConfirmToQuitEnabled[] = "browser.confirm_to_quit";
366 363
367 // OBSOLETE. Enum that specifies whether to enforce a third-party cookie 364 // OBSOLETE. Enum that specifies whether to enforce a third-party cookie
368 // blocking policy. This has been superseded by kDefaultContentSettings + 365 // blocking policy. This has been superseded by kDefaultContentSettings +
369 // kBlockThirdPartyCookies. 366 // kBlockThirdPartyCookies.
(...skipping 2322 matching lines...) Expand 10 before | Expand all | Expand 10 after
2692 2689
2693 // The number of seconds since epoch that the OS password was last changed. 2690 // The number of seconds since epoch that the OS password was last changed.
2694 const char kOsPasswordLastChanged[] = 2691 const char kOsPasswordLastChanged[] =
2695 "password_manager.os_password_last_changed"; 2692 "password_manager.os_password_last_changed";
2696 #endif 2693 #endif
2697 2694
2698 // Whether DNS Quick Check is disabled in proxy resolution. 2695 // Whether DNS Quick Check is disabled in proxy resolution.
2699 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled"; 2696 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
2700 2697
2701 } // namespace prefs 2698 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698