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

Unified Diff: chrome/browser/autocomplete/builtin_provider.cc

Issue 8573021: chrome: Remove 14 exit time destructors and 2 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Hopefully fix problems seen on the bots Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/builtin_provider.cc
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index 54a1b6034917bcece3d42e526a255ddace9efe6a..fd0c67711e7957cbe6b6e1d8be4877c97d2a4c08 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;
- static const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
+ const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
ASCIIToUTF16(chrome::kStandardSchemeSeparator);
- static const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
+ const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
ASCIIToUTF16(chrome::kStandardSchemeSeparator);
- static const int kUrl = ACMatchClassification::URL;
- static const int kMatch = kUrl | ACMatchClassification::MATCH;
+ const int kUrl = ACMatchClassification::URL;
+ 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://".
- static const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme);
+ 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();
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider.cc » ('j') | chrome/browser/google/google_update_settings_posix.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698