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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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/layout.h"
20 #include "ui/base/resource/resource_bundle.h" 21 #include "ui/base/resource/resource_bundle.h"
21 22
22 // Define the values of standard URLs. 23 // Define the values of standard URLs.
23 const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] = 24 const char CloudPrintSetupSource::kInvalidPasswordHelpUrl[] =
24 "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444"; 25 "https://www.google.com/support/accounts/bin/answer.py?ctx=ch&answer=27444";
25 const char CloudPrintSetupSource::kCanNotAccessAccountUrl[] = 26 const char CloudPrintSetupSource::kCanNotAccessAccountUrl[] =
26 "https://www.google.com/support/accounts/bin/answer.py?answer=48598"; 27 "https://www.google.com/support/accounts/bin/answer.py?answer=48598";
27 const char CloudPrintSetupSource::kCreateNewAccountUrl[] = 28 const char CloudPrintSetupSource::kCreateNewAccountUrl[] =
28 "https://accounts.google.com/NewAccount?service=chromiumsync"; 29 "https://accounts.google.com/NewAccount?service=chromiumsync";
29 30
(...skipping 30 matching lines...) Expand all
60 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); 61 l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)));
61 AddString(dict, "explain", IDS_CLOUD_PRINT_SETUP_EXPLAIN); 62 AddString(dict, "explain", IDS_CLOUD_PRINT_SETUP_EXPLAIN);
62 AddString(dict, "anywhereheader", IDS_CLOUD_PRINT_SETUP_ANYWHERE_HEADER); 63 AddString(dict, "anywhereheader", IDS_CLOUD_PRINT_SETUP_ANYWHERE_HEADER);
63 AddString(dict, "anywhereexplain", IDS_CLOUD_PRINT_SETUP_ANYWHERE_EXPLAIN); 64 AddString(dict, "anywhereexplain", IDS_CLOUD_PRINT_SETUP_ANYWHERE_EXPLAIN);
64 AddString(dict, "printerheader", IDS_CLOUD_PRINT_SETUP_PRINTER_HEADER); 65 AddString(dict, "printerheader", IDS_CLOUD_PRINT_SETUP_PRINTER_HEADER);
65 AddString(dict, "printerexplain", IDS_CLOUD_PRINT_SETUP_PRINTER_EXPLAIN); 66 AddString(dict, "printerexplain", IDS_CLOUD_PRINT_SETUP_PRINTER_EXPLAIN);
66 AddString(dict, "sharingheader", IDS_CLOUD_PRINT_SETUP_SHARING_HEADER); 67 AddString(dict, "sharingheader", IDS_CLOUD_PRINT_SETUP_SHARING_HEADER);
67 AddString(dict, "sharingexplain", IDS_CLOUD_PRINT_SETUP_SHARING_EXPLAIN); 68 AddString(dict, "sharingexplain", IDS_CLOUD_PRINT_SETUP_SHARING_EXPLAIN);
68 69
69 static const base::StringPiece html(ResourceBundle::GetSharedInstance() 70 static const base::StringPiece html(ResourceBundle::GetSharedInstance()
70 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML)); 71 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML,
72 ui::SCALE_FACTOR_NONE));
71 SetFontAndTextDirection(dict); 73 SetFontAndTextDirection(dict);
72 response = jstemplate_builder::GetI18nTemplateHtml(html, dict); 74 response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
73 } else if (path_raw == kCloudPrintGaiaLoginPath) { 75 } else if (path_raw == kCloudPrintGaiaLoginPath) {
74 // Start by setting the per-locale URLs we show on the setup wizard. 76 // Start by setting the per-locale URLs we show on the setup wizard.
75 dict->SetString("invalidpasswordhelpurl", 77 dict->SetString("invalidpasswordhelpurl",
76 GetLocalizedUrl(kInvalidPasswordHelpUrl)); 78 GetLocalizedUrl(kInvalidPasswordHelpUrl));
77 dict->SetString("cannotaccessaccounturl", 79 dict->SetString("cannotaccessaccounturl",
78 GetLocalizedUrl(kCanNotAccessAccountUrl)); 80 GetLocalizedUrl(kCanNotAccessAccountUrl));
79 dict->SetString("createnewaccounturl", 81 dict->SetString("createnewaccounturl",
80 GetLocalizedUrl(kCreateNewAccountUrl)); 82 GetLocalizedUrl(kCreateNewAccountUrl));
(...skipping 15 matching lines...) Expand all
96 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP); 98 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP);
97 AddString(dict, "success", IDS_SYNC_SUCCESS); 99 AddString(dict, "success", IDS_SYNC_SUCCESS);
98 AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN); 100 AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN);
99 AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS); 101 AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS);
100 AddString(dict, "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL); 102 AddString(dict, "invalidaccesscode", IDS_SYNC_INVALID_ACCESS_CODE_LABEL);
101 AddString(dict, "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL); 103 AddString(dict, "enteraccesscode", IDS_SYNC_ENTER_ACCESS_CODE_LABEL);
102 AddString(dict, "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL); 104 AddString(dict, "getaccesscodehelp", IDS_SYNC_ACCESS_CODE_HELP_LABEL);
103 AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL); 105 AddString(dict, "getaccesscodeurl", IDS_SYNC_GET_ACCESS_CODE_URL);
104 106
105 static const base::StringPiece html(ResourceBundle::GetSharedInstance() 107 static const base::StringPiece html(ResourceBundle::GetSharedInstance()
106 .GetRawDataResource(IDR_GAIA_LOGIN_HTML)); 108 .GetRawDataResource(IDR_GAIA_LOGIN_HTML,
109 ui::SCALE_FACTOR_NONE));
107 SetFontAndTextDirection(dict); 110 SetFontAndTextDirection(dict);
108 response = jstemplate_builder::GetI18nTemplateHtml(html, dict); 111 response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
109 } else if (path_raw == kCloudPrintSetupDonePath) { 112 } else if (path_raw == kCloudPrintSetupDonePath) {
110 AddString(dict, "testpage", IDS_CLOUD_PRINT_SETUP_TEST_PAGE); 113 AddString(dict, "testpage", IDS_CLOUD_PRINT_SETUP_TEST_PAGE);
111 AddString(dict, "success", IDS_SYNC_SUCCESS); 114 AddString(dict, "success", IDS_SYNC_SUCCESS);
112 AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL); 115 AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL);
113 static const base::StringPiece html(ResourceBundle::GetSharedInstance() 116 static const base::StringPiece html(ResourceBundle::GetSharedInstance()
114 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML)); 117 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML,
118 ui::SCALE_FACTOR_NONE));
115 SetFontAndTextDirection(dict); 119 SetFontAndTextDirection(dict);
116 response = jstemplate_builder::GetI18nTemplateHtml(html, dict); 120 response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
117 } else if (path_raw == kCloudPrintSetupFlowPath) { 121 } else if (path_raw == kCloudPrintSetupFlowPath) {
118 static const base::StringPiece html( 122 static const base::StringPiece html(
119 ResourceBundle::GetSharedInstance() 123 ResourceBundle::GetSharedInstance()
120 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML)); 124 .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_FLOW_HTML,
125 ui::SCALE_FACTOR_NONE));
121 response = html.as_string(); 126 response = html.as_string();
122 } 127 }
123 128
124 SendResponse(request_id, base::RefCountedString::TakeString(&response)); 129 SendResponse(request_id, base::RefCountedString::TakeString(&response));
125 } 130 }
126 131
127 std::string CloudPrintSetupSource::GetMimeType(const std::string& path) const { 132 std::string CloudPrintSetupSource::GetMimeType(const std::string& path) const {
128 return "text/html"; 133 return "text/html";
129 } 134 }
130 135
131 std::string CloudPrintSetupSource::GetLocalizedUrl( 136 std::string CloudPrintSetupSource::GetLocalizedUrl(
132 const std::string& url) const { 137 const std::string& url) const {
133 GURL original_url(url); 138 GURL original_url(url);
134 DCHECK(original_url.is_valid()); 139 DCHECK(original_url.is_valid());
135 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url); 140 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url);
136 return localized_url.spec(); 141 return localized_url.spec();
137 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698