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 3266 matching lines @@
     UNHANDLED_COUNTRY(U, G)  // Uganda
     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)
   }
 }
 

[Peter Kasting, 2012/08/28 00:04:07]

Nit: Two blank lines above these section dividers

[samarth, 2012/08/28 16:18:15]

Done.

+// Logo URLs ///////////////////////////////////////////////////////////////////
+
+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
 

[Peter Kasting, 2012/08/28 00:04:07]

Nit: Can you add a ////////// nameless divider here?

[samarth, 2012/08/28 16:18:15]

Done.

 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,
                              kCountryIDUnknown,
                              PrefService::UNSYNCABLE_PREF);
@@ skipping 57 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 std::string& url) {
+  // Restricted to UI thread because GetEngineType() is so restricted.

[msw, 2012/08/27 21:57:26]

nit: There doesn't seem to be much value in DCHECKing this at every level of
use... I suggest removing these and letting GetEngineType DCHECK as appropriate.

[samarth, 2012/08/28 16:18:15]

Done.

+  using content::BrowserThread;
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  switch (GetEngineType(url)) {

[Peter Kasting, 2012/08/28 00:04:07]

Nit: For now, use "if (GetEngineType(url) == SEARCH_ENGINE_GOOGLE)" or even
"return <conditional> ? GURL(...) : GURL();.  We can expand to a switch, or even
better an array of logos, if/when we add more providers.

[samarth, 2012/08/28 16:18:15]

Done.

+    case SEARCH_ENGINE_GOOGLE:
+      return GURL(google_logos.logo_100_percent_url);
+    default:
+      return GURL("");

[msw, 2012/08/27 21:57:26]

nit: remove empty string literal.

[samarth, 2012/08/28 16:18:15]

Done.

+  }
+}

[msw, 2012/08/27 21:57:26]

nit: some compilers may complain about not all paths returning a value, you may
as well return GURL() here too.

[samarth, 2012/08/28 16:18:15]

Done.

+
+GURL GetLogo200PercentURL(const std::string& url) {
+  // Restricted to UI thread because GetEngineType() is so restricted.

[msw, 2012/08/27 21:57:26]

ditto: (nit: remove DCHECKs)

[samarth, 2012/08/28 16:18:15]

Done.

+  using content::BrowserThread;
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  switch (GetEngineType(url)) {
+    case SEARCH_ENGINE_GOOGLE:
+      return GURL(google_logos.logo_200_percent_url);
+    default:
+      return GURL("");

[msw, 2012/08/27 21:57:26]

ditto (nit: remove empty string literal)

[samarth, 2012/08/28 16:18:15]

Done.

+  }
+}

[msw, 2012/08/27 21:57:26]

ditto (nit: return GURL() here)

[samarth, 2012/08/28 16:18:15]

Done.

+
 #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