diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 01:56:35 +0000 |
| commit | 9f66d3066829486700ed7ac72328defcd2196ff3 (patch) | |
| tree | eb836489bb6e29d77fdffc258b1a8039e257868f /chrome/browser/autocomplete | |
| parent | 6f7e5bc02b5edc14761ad17fd5abd4e97e9d1553 (diff) | |
| download | chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.zip chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.gz chromium_src-9f66d3066829486700ed7ac72328defcd2196ff3.tar.bz2 | |
Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Review URL: http://codereview.chromium.org/8573021
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/8568039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/builtin_provider.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc index fd0c677..54a1b60 100644 --- a/chrome/browser/autocomplete/builtin_provider.cc +++ b/chrome/browser/autocomplete/builtin_provider.cc @@ -63,13 +63,13 @@ void BuiltinProvider::Start(const AutocompleteInput& input, (input.matches_requested() == AutocompleteInput::BEST_MATCH)) return; - const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) + + static const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) + ASCIIToUTF16(chrome::kStandardSchemeSeparator); - const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) + + static const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) + ASCIIToUTF16(chrome::kStandardSchemeSeparator); - const int kUrl = ACMatchClassification::URL; - const int kMatch = kUrl | ACMatchClassification::MATCH; + static const int kUrl = ACMatchClassification::URL; + static const int kMatch = kUrl | ACMatchClassification::MATCH; string16 text = input.text(); bool starting_chrome = StartsWith(kChrome, text, false); @@ -77,7 +77,7 @@ void BuiltinProvider::Start(const AutocompleteInput& input, ACMatchClassifications styles; // Highlight the input portion matching "chrome://"; or if the user has // input "about:" (with optional slashes), highlight the whole "chrome://". - const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme); + static const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme); bool highlight = starting_chrome || text.length() > kAboutSchemeLength; styles.push_back(ACMatchClassification(0, highlight ? kMatch : kUrl)); size_t offset = starting_chrome ? text.length() : kChrome.length(); diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 62d5b92..9453e19 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -330,7 +330,7 @@ void SearchProvider::StartOrStopSuggestQuery(bool minimal_changes) { // Don't send any queries to the server until some time has elapsed after // the last keypress, to avoid flooding the server with requests we are // likely to end up throwing away anyway. - const int kQueryDelayMs = 200; + static const int kQueryDelayMs = 200; if (!IsQuerySuitableForSuggest()) { StopSuggest(); @@ -491,7 +491,7 @@ bool SearchProvider::ParseSuggestResults(Value* root_val, DictionaryValue* dict_val = static_cast<DictionaryValue*>(optional_val); // Parse Google Suggest specific type extension. - const std::string kGoogleSuggestType("google:suggesttype"); + static const std::string kGoogleSuggestType("google:suggesttype"); if (dict_val->HasKey(kGoogleSuggestType)) dict_val->GetList(kGoogleSuggestType, &type_list); } |