| Index: chrome/browser/printing/cloud_print/cloud_print_setup_source.cc
|
| ===================================================================
|
| --- chrome/browser/printing/cloud_print/cloud_print_setup_source.cc (revision 176443)
|
| +++ chrome/browser/printing/cloud_print/cloud_print_setup_source.cc (working copy)
|
| @@ -9,7 +9,9 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/google/google_util.h"
|
| +#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
|
| #include "chrome/common/jstemplate_builder.h"
|
| +#include "chrome/common/url_constants.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "grit/browser_resources.h"
|
| #include "grit/chromium_strings.h"
|
| @@ -38,10 +40,13 @@
|
|
|
| } // namespace
|
|
|
| -CloudPrintSetupSource::CloudPrintSetupSource()
|
| - : DataSource(chrome::kChromeUICloudPrintSetupHost, MessageLoop::current()) {
|
| +CloudPrintSetupSource::CloudPrintSetupSource() {
|
| }
|
|
|
| +std::string CloudPrintSetupSource::GetSource() {
|
| + return chrome::kChromeUICloudPrintSetupHost;
|
| +}
|
| +
|
| void CloudPrintSetupSource::StartDataRequest(const std::string& path_raw,
|
| bool is_incognito,
|
| int request_id) {
|
| @@ -68,7 +73,7 @@
|
|
|
| static const base::StringPiece html(ResourceBundle::GetSharedInstance()
|
| .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_LOGIN_HTML));
|
| - SetFontAndTextDirection(dict);
|
| + URLDataSource::SetFontAndTextDirection(dict);
|
| response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
|
| } else if (path_raw == kCloudPrintGaiaLoginPath) {
|
| // Start by setting the per-locale URLs we show on the setup wizard.
|
| @@ -104,7 +109,7 @@
|
|
|
| static const base::StringPiece html(ResourceBundle::GetSharedInstance()
|
| .GetRawDataResource(IDR_GAIA_LOGIN_HTML));
|
| - SetFontAndTextDirection(dict);
|
| + URLDataSource::SetFontAndTextDirection(dict);
|
| response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
|
| } else if (path_raw == kCloudPrintSetupDonePath) {
|
| AddString(dict, "testpage", IDS_CLOUD_PRINT_SETUP_TEST_PAGE);
|
| @@ -112,7 +117,7 @@
|
| AddString(dict, "okay", IDS_SYNC_SETUP_OK_BUTTON_LABEL);
|
| static const base::StringPiece html(ResourceBundle::GetSharedInstance()
|
| .GetRawDataResource(IDR_CLOUD_PRINT_SETUP_DONE_HTML));
|
| - SetFontAndTextDirection(dict);
|
| + URLDataSource::SetFontAndTextDirection(dict);
|
| response = jstemplate_builder::GetI18nTemplateHtml(html, dict);
|
| } else if (path_raw == kCloudPrintSetupFlowPath) {
|
| static const base::StringPiece html(
|
| @@ -121,7 +126,8 @@
|
| response = html.as_string();
|
| }
|
|
|
| - SendResponse(request_id, base::RefCountedString::TakeString(&response));
|
| + url_data_source()->SendResponse(
|
| + request_id, base::RefCountedString::TakeString(&response));
|
| }
|
|
|
| std::string CloudPrintSetupSource::GetMimeType(const std::string& path) const {
|
|
|