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

Side by Side Diff: chrome/browser/printing/cloud_print/cloud_print_setup_source.cc

Issue 10411025: Reverted 136345 - Ran into GAIA dosserver issues in prod for http://accounts.google.com. We are goi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h" 5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/google/google_util.h" 11 #include "chrome/browser/google/google_util.h"
12 #include "chrome/common/jstemplate_builder.h" 12 #include "chrome/common/jstemplate_builder.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "grit/browser_resources.h" 14 #include "grit/browser_resources.h"
15 #include "grit/chromium_strings.h" 15 #include "grit/chromium_strings.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/locale_settings.h" 17 #include "grit/locale_settings.h"
18 #include "grit/ui_resources.h" 18 #include "grit/ui_resources.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 21
22 // Define the values of standard URLs. 22 // Define the values of standard URLs.
23 const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] = 23 const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] =
24 "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444"; 24 "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
25 const char CloudPrintSetupSource::kCanNotAccessAccountUrl[] = 25 const char CloudPrintSetupSource::kCanNotAccessAccountUrl[] =
26 "https://www.google.com/support/accounts/bin/answer.py?answer=48598"; 26 "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
27 const char CloudPrintSetupSource::kCreateNewAccountUrl[] = 27 const char CloudPrintSetupSource::kCreateNewAccountUrl[] =
28 "https://accounts.google.com/NewAccount?service=chromiumsync"; 28 "https://www.google.com/accounts/NewAccount?service=chromiumsync";
29 29
30 namespace { 30 namespace {
31 31
32 // Utility method to keep dictionary population code streamlined. 32 // Utility method to keep dictionary population code streamlined.
33 void AddString(DictionaryValue* dictionary, 33 void AddString(DictionaryValue* dictionary,
34 const std::string& key, 34 const std::string& key,
35 int resource_id) { 35 int resource_id) {
36 dictionary->SetString(key, l10n_util::GetStringUTF16(resource_id)); 36 dictionary->SetString(key, l10n_util::GetStringUTF16(resource_id));
37 } 37 }
38 38
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 return "text/html"; 128 return "text/html";
129 } 129 }
130 130
131 std::string CloudPrintSetupSource::GetLocalizedUrl( 131 std::string CloudPrintSetupSource::GetLocalizedUrl(
132 const std::string& url) const { 132 const std::string& url) const {
133 GURL original_url(url); 133 GURL original_url(url);
134 DCHECK(original_url.is_valid()); 134 DCHECK(original_url.is_valid());
135 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url); 135 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url);
136 return localized_url.spec(); 136 return localized_url.spec();
137 } 137 }
OLDNEW
« no previous file with comments | « chrome/browser/password_manager/login_database_unittest.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698