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

Unified Diff: chrome/browser/android/logo_service.cc

Issue 264713013: Allow overriding Google doodle URL on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/logo_service.cc
diff --git a/chrome/browser/android/logo_service.cc b/chrome/browser/android/logo_service.cc
index 266d22669a2f83908c90a3bd17ecb4e7ad0ecb3f..3dea4493251c86aa1679e200e6e16a5838a478d4 100644
--- a/chrome/browser/android/logo_service.cc
+++ b/chrome/browser/android/logo_service.cc
@@ -6,6 +6,7 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/google/google_util.h"
#include "chrome/browser/image_decoder.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -35,7 +36,11 @@ GURL GetGoogleDoodleURL(Profile* profile) {
std::string path = kGoogleDoodleURLPath;
GURL::Replacements replacements;
replacements.SetPathStr(path);
- return GoogleURLTracker::GoogleURL(profile).ReplaceComponents(replacements);
+
+ GURL base_url(google_util::CommandLineGoogleBaseURL());
+ if (!base_url.is_valid())
+ base_url = GoogleURLTracker::GoogleURL(profile);
+ return base_url.ReplaceComponents(replacements);
}
class LogoDecoderDelegate : public ImageDecoder::Delegate {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698