Add a getter for search provider logos.

chrome/browser/search_engines/template_url_prepopulate_data.cc

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index acd3089701c70accc981e12cdad80915b2971c9b..3ae460a3eeab058dad4a08b8adb2fe4fb9c6e4ec 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -3285,6 +3285,22 @@ void GetPrepopulationSetFromCountryID(PrefService* prefs,
   }
 }
 
+
+// Logo URLs ///////////////////////////////////////////////////////////////////

[msw, 2012/08/28 22:26:22]

nit: this needs to be about 15 lines of ascii art :)

[samarth, 2012/08/28 23:29:20]

You mean this? :)


#
#         ####    ####    ####
#        #    #  #    #  #    #
#        #    #  #       #    #
#        #    #  #  ###  #    #
#        #    #  #    #  #    #
#######   ####    ####    ####

#     # ######  #
#     # #     # #         ####
#     # #     # #        #
#     # ######  #         ####
#     # #   #   #             #
#     # #    #  #        #    #
 #####  #     # #######   ####

+
+struct LogoURLs {
+  const char* const logo_100_percent_url;
+  const char* const logo_200_percent_url;
+};
+
+const LogoURLs google_logos = {
+  "https://www.google.com/images/chrome_search/google_logo.png",
+  "https://www.google.com/images/chrome_search/google_logo_2x.png",
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+
 }  // namespace
 
 namespace TemplateURLPrepopulateData {
@@ -3364,17 +3380,16 @@ void GetPrepopulatedTemplateFromPrefs(Profile* profile,
 
   size_t num_engines = list->GetSize();
   for (size_t i = 0; i != num_engines; ++i) {
-    const Value* val;
     const DictionaryValue* engine;
     if (list->GetDictionary(i, &engine) &&
-        engine->Get("name", &val) && val->GetAsString(&name) &&
-        engine->Get("keyword", &val) && val->GetAsString(&keyword) &&
-        engine->Get("search_url", &val) && val->GetAsString(&search_url) &&
-        engine->Get("suggest_url", &val) && val->GetAsString(&suggest_url) &&
-        engine->Get("instant_url", &val) && val->GetAsString(&instant_url) &&
-        engine->Get("favicon_url", &val) && val->GetAsString(&favicon_url) &&
-        engine->Get("encoding", &val) && val->GetAsString(&encoding) &&
-        engine->Get("id", &val) && val->GetAsInteger(&id)) {
+        engine->GetString("name", &name) &&
+        engine->GetString("keyword", &keyword) &&
+        engine->GetString("search_url", &search_url) &&
+        engine->GetString("suggest_url", &suggest_url) &&
+        engine->GetString("instant_url", &instant_url) &&
+        engine->GetString("favicon_url", &favicon_url) &&
+        engine->GetString("encoding", &encoding) &&
+        engine->GetInteger("id", &id)) {
       // These next fields are not allowed to be empty.
       if (name.empty() || keyword.empty() || search_url.empty() ||
           favicon_url.empty() || encoding.empty())
@@ -3471,6 +3486,17 @@ SearchEngineType GetEngineType(const std::string& url) {
   return SEARCH_ENGINE_OTHER;
 }
 
+GURL GetLogoURL(const TemplateURL& template_url, LogoSize size) {
+  if (GetEngineType(template_url.url()) == SEARCH_ENGINE_GOOGLE) {
+    if (size == LOGO_100_PERCENT) {
+      return GURL(google_logos.logo_100_percent_url);
+    } else if (size == LOGO_200_PERCENT) {

[Peter Kasting, 2012/08/28 23:20:20]

Nit: No else after return.  Just do this:

    return GURL((size == LOGO_200_PERCENT) ?
        google_logos.logo_200_percent_url : google_logos.logo_100_percent_url);

[samarth, 2012/08/28 23:29:20]

This style could easily break if we added more sizes and not all logos were
available in each size. Right now, every case not covered falls through to the
empty GURL below. But I don't feel too strongly if you'd like me to use the
ternary.

[Peter Kasting, 2012/08/28 23:32:54]

I think it's nice to be brief since we don't have any immediate plans to add Yet
More Sizes.  I would also be OK with replacing the "else if" with a DCHECK_EQ if
you really want to verify this, but the pattern we normally use in e.g. infobar
button handling (where we have a similar two-value enum) is to just use ?: and
not worry much.

Up to you as long as there's no return after else.

+      return GURL(google_logos.logo_200_percent_url);
+    }
+  }
+  return GURL();
+}
+
 #if defined(OS_ANDROID)
 
 void InitCountryCode(const std::string& country_code) {