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

Unified Diff: chrome/browser/printing/cloud_print/cloud_print_url.cc

Issue 7518002: Add sign in dialog for GCP->print preview integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review feedback Created 9 years, 4 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
Index: chrome/browser/printing/cloud_print/cloud_print_url.cc
diff --git a/chrome/browser/printing/cloud_print/cloud_print_url.cc b/chrome/browser/printing/cloud_print/cloud_print_url.cc
index 209fe86975333e13845ab1916ec3e8102bd0306b..b22880db4d934671ebb604e3a4cca0249792e435 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_url.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_url.cc
@@ -15,6 +15,10 @@
#include "googleurl/src/gurl.h"
const char kDefaultCloudPrintServiceURL[] = "https://www.google.com/cloudprint";
+const char kDefaultCloudPrintSigninURL[] =
+ "https://www.google.com/accounts/ServiceLogin?"
+ "service=cloudprint&continue=https%3A%2F%2Fwww.google.com%2Fcloudprint";
+
const char kLearnMoreURL[] =
"https://www.google.com/support/cloudprint";
const char kTestPageURL[] =
@@ -23,11 +27,16 @@ const char kTestPageURL[] =
void CloudPrintURL::RegisterPreferences() {
DCHECK(profile_);
PrefService* pref_service = profile_->GetPrefs();
- if (pref_service->FindPreference(prefs::kCloudPrintServiceURL))
- return;
- pref_service->RegisterStringPref(prefs::kCloudPrintServiceURL,
- kDefaultCloudPrintServiceURL,
- PrefService::UNSYNCABLE_PREF);
+ if (!pref_service->FindPreference(prefs::kCloudPrintServiceURL)) {
+ pref_service->RegisterStringPref(prefs::kCloudPrintServiceURL,
+ kDefaultCloudPrintServiceURL,
+ PrefService::UNSYNCABLE_PREF);
+ }
+ if (!pref_service->FindPreference(prefs::kCloudPrintSigninURL)) {
+ pref_service->RegisterStringPref(prefs::kCloudPrintSigninURL,
+ kDefaultCloudPrintSigninURL,
+ PrefService::UNSYNCABLE_PREF);
+ }
}
// Returns the root service URL for the cloud print service. The default is to
@@ -47,6 +56,15 @@ GURL CloudPrintURL::GetCloudPrintServiceURL() {
return cloud_print_service_url;
}
+GURL CloudPrintURL::GetCloudPrintSigninURL() {
+ DCHECK(profile_);
+ RegisterPreferences();
+
+ GURL cloud_print_signin_url = GURL(
+ profile_->GetPrefs()->GetString(prefs::kCloudPrintSigninURL));
+ return google_util::AppendGoogleLocaleParam(cloud_print_signin_url);
+}
+
GURL CloudPrintURL::GetCloudPrintServiceDialogURL() {
GURL cloud_print_service_url = GetCloudPrintServiceURL();
std::string path(cloud_print_service_url.path() + "/client/dialog.html");
« no previous file with comments | « chrome/browser/printing/cloud_print/cloud_print_url.h ('k') | chrome/browser/ui/webui/cloud_print_signin_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698