Add a getter for search provider logos.

chrome/browser/search_engines/template_url_prepopulate_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <locale.h>
 #endif
 
@@ skipping 3267 matching lines @@
     UNHANDLED_COUNTRY(V, C)  // Saint Vincent and the Grenadines
     UNHANDLED_COUNTRY(V, U)  // Vanuatu
     UNHANDLED_COUNTRY(W, S)  // Samoa
     UNHANDLED_COUNTRY(Z, M)  // Zambia
     case kCountryIDUnknown:
     default:                // Unhandled location
     END_UNHANDLED_COUNTRIES(def, ault)
   }
 }
 
+
+// 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 {
 
 // The following id is for UMA stats only. Please update
 // kMaxPrepopulatedEngineID if it changes upwards.
 const int kMaxPrepopulatedEngineID = 101;
 
 void RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall,
@@ skipping 59 matching lines @@
   string16 keyword;
   std::string search_url;
   std::string suggest_url;
   std::string instant_url;
   std::string favicon_url;
   std::string encoding;
   int id;
 
   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())
         return;
     } else {
       // Got a parsing error. No big deal.
       continue;
     }
     t_urls->push_back(MakePrepopulatedTemplateURL(profile, name, keyword,
         search_url, suggest_url, instant_url, favicon_url, encoding, id));
@@ skipping 76 matching lines @@
   GURL origin(as_gurl.GetOrigin());
   for (size_t i = 0; i < arraysize(kAllEngines); ++i) {
     GURL engine_url(kAllEngines[i]->search_url);
     if (engine_url.is_valid() && (origin == engine_url.GetOrigin()))
       return kAllEngines[i]->type;
   }
 
   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) {
   if (country_code.size() != 2) {
     DLOG(ERROR) << "Invalid country code: " << country_code;
     g_country_code_at_install = kCountryIDUnknown;
   } else {
     g_country_code_at_install =
         CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
   }
 }
 
 #endif
 
 }  // namespace TemplateURLPrepopulateData