diff options
Diffstat (limited to 'chrome/browser/search_engines')
5 files changed, 15 insertions, 8 deletions
diff --git a/chrome/browser/search_engines/edit_search_engine_controller.cc b/chrome/browser/search_engines/edit_search_engine_controller.cc index 9e3d5d7..58fb95b 100644 --- a/chrome/browser/search_engines/edit_search_engine_controller.cc +++ b/chrome/browser/search_engines/edit_search_engine_controller.cc @@ -5,6 +5,7 @@ #include "chrome/browser/search_engines/edit_search_engine_controller.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index 8432064..bc9af41 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -8,7 +8,7 @@ #include "app/l10n_util.h" #include "base/i18n/icu_string_conversions.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/search_engines/template_url_model.h" diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index 60947c6..ff0d2af3d 100644 --- a/chrome/browser/search_engines/template_url_parser.cc +++ b/chrome/browser/search_engines/template_url_parser.cc @@ -4,12 +4,14 @@ #include "chrome/browser/search_engines/template_url_parser.h" +#include <algorithm> #include <map> #include <vector> #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" @@ -205,7 +207,7 @@ class ParsingContext { private: static void InitMapping() { - kElementNameToElementTypeMap = new std::map<std::string,ElementType>; + kElementNameToElementTypeMap = new std::map<std::string, ElementType>; (*kElementNameToElementTypeMap)[kURLElement] = URL; (*kElementNameToElementTypeMap)[kParamElement] = PARAM; (*kElementNameToElementTypeMap)[kShortNameElement] = SHORT_NAME; @@ -222,7 +224,7 @@ class ParsingContext { } // Key is UTF8 encoded. - static std::map<std::string,ElementType>* kElementNameToElementTypeMap; + static std::map<std::string, ElementType>* kElementNameToElementTypeMap; // TemplateURL supplied to Read method. It's owned by the caller, so we // don't need to free it. TemplateURL* url_; @@ -253,7 +255,7 @@ class ParsingContext { }; // static -std::map<std::string,ParsingContext::ElementType>* +std::map<std::string, ParsingContext::ElementType>* ParsingContext::kElementNameToElementTypeMap = NULL; std::wstring XMLCharToWide(const xmlChar* value) { @@ -385,10 +387,10 @@ static void AppendParamToQuery(const std::string& key, const std::string& value, std::string* query) { if (!query->empty()) - query->append("&"); + query->append("&"); if (!key.empty()) { - query->append(key); - query->append("="); + query->append(key); + query->append("="); } query->append(value); } @@ -548,7 +550,7 @@ bool IsLegal(TemplateURL* url) { return true; } -} // namespace +} // namespace // static bool TemplateURLParser::Parse(const unsigned char* data, size_t length, diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc index c47ce9a..894f56f 100644 --- a/chrome/browser/search_engines/template_url_table_model.cc +++ b/chrome/browser/search_engines/template_url_table_model.cc @@ -4,12 +4,15 @@ #include "chrome/browser/search_engines/template_url_table_model.h" +#include <vector> + #include "app/gfx/codec/png_codec.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/table_model_observer.h" #include "base/callback.h" #include "base/stl_util-inl.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/profile.h" #include "grit/app_resources.h" diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc index 5c6414b..b2ef832 100644 --- a/chrome/browser/search_engines/template_url_unittest.cc +++ b/chrome/browser/search_engines/template_url_unittest.cc @@ -4,6 +4,7 @@ #include "base/base_paths.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/template_url.h" |