diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 22:55:04 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-11 22:55:04 +0000 |
| commit | ea798f750571aed66bbcc912e83cd0661e8b2e2e (patch) | |
| tree | 443d8f8501f06653552413351b3994cacbb63ff5 /chrome/common | |
| parent | d90617b6b1278a6bdcc239c61bf4d58c1b822704 (diff) | |
| download | chromium_src-ea798f750571aed66bbcc912e83cd0661e8b2e2e.zip chromium_src-ea798f750571aed66bbcc912e83cd0661e8b2e2e.tar.gz chromium_src-ea798f750571aed66bbcc912e83cd0661e8b2e2e.tar.bz2 | |
Revert 62193 - Final phase of the URL History Quick autocomplete provider integration. This phase hooks up the InMemoryURLIndex to the HistoryQuickProvider which is itself made active during the autocomplete process. A small amount of refactoring was done to liberate some common functionality from the history_url_provider.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3375002
TBR=mrossetti@chromium.org
Review URL: http://codereview.chromium.org/3660007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 10 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 3e9b867..394160b 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -206,12 +206,6 @@ const char kDisableGLSLTranslator[] = "disable-glsl-translator"; // Manager can be used to terminate the offending process in this case. const char kDisableHangMonitor[] = "disable-hang-monitor"; -// Disable the use of the HistoryQuickProvider for autocomplete results. -const char kDisableHistoryQuickProvider[] = "disable-history-quick-provider"; - -// Disable the use of the HistoryURLProvider for autocomplete results. -const char kDisableHistoryURLProvider[] = "disable-history-url-provider"; - // Disable the Indexed Database API. const char kDisableIndexedDatabase[] = "disable-indexed-database"; @@ -433,6 +427,10 @@ const char kEnableFileCookies[] = "enable-file-cookies"; // Enable the FileSystem API. const char kEnableFileSystem[] = "enable-file-system"; +// Use the InMemoryURLIndex to back the HistoryURLProvider for autocomplete +// results. If not set, defaults to using the InMemoryDatabase. +const char kEnableInMemoryURLIndex[] = "enable-in-memory-url-index"; + // Enable IPv6 support, even if probes suggest that it may not be fully // supported. Some probes may require internet connections, and this flag will // allow support independent of application testing. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 1a33d78..91aa5fa 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -70,8 +70,6 @@ extern const char kDisableExtensionsFileAccessCheck[]; extern const char kDisableGeolocation[]; extern const char kDisableGLSLTranslator[]; extern const char kDisableHangMonitor[]; -extern const char kDisableHistoryQuickProvider[]; -extern const char kDisableHistoryURLProvider[]; extern const char kDisableInternalFlash[]; extern const char kDisableIndexedDatabase[]; extern const char kDisableIPv6[]; @@ -136,6 +134,7 @@ extern const char kEnableFileCookies[]; extern const char kEnableFileSystem[]; extern const char kEnableGPUPlugin[]; extern const char kEnableGPURendering[]; +extern const char kEnableInMemoryURLIndex[]; extern const char kEnableIPv6[]; extern const char kEnableLogging[]; extern const char kEnableMatchPreview[]; |