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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 7397021: Re-land r93365 - add RefCountedString (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 9 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/webui/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 response = jstemplate_builder::GetI18nTemplateHtml( 106 response = jstemplate_builder::GetI18nTemplateHtml(
107 html, localized_strings_.get()); 107 html, localized_strings_.get());
108 } else if (path == kEnterpriseEnrollmentGaiaLoginPath) { 108 } else if (path == kEnterpriseEnrollmentGaiaLoginPath) {
109 static const base::StringPiece html( 109 static const base::StringPiece html(
110 ResourceBundle::GetSharedInstance().GetRawDataResource( 110 ResourceBundle::GetSharedInstance().GetRawDataResource(
111 IDR_GAIA_LOGIN_HTML)); 111 IDR_GAIA_LOGIN_HTML));
112 response = jstemplate_builder::GetI18nTemplateHtml( 112 response = jstemplate_builder::GetI18nTemplateHtml(
113 html, localized_strings_.get()); 113 html, localized_strings_.get());
114 } 114 }
115 115
116 scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes()); 116 SendResponse(request_id, base::RefCountedString::TakeString(&response));
117 html_bytes->data.resize(response.size());
118 std::copy(response.begin(), response.end(), html_bytes->data.begin());
119
120 SendResponse(request_id, html_bytes);
121 } 117 }
122 118
123 // CoreOobeHandler ------------------------------------------------------------ 119 // CoreOobeHandler ------------------------------------------------------------
124 120
125 CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui) 121 CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui)
126 : oobe_ui_(oobe_ui) { 122 : oobe_ui_(oobe_ui) {
127 } 123 }
128 124
129 CoreOobeHandler::~CoreOobeHandler() { 125 CoreOobeHandler::~CoreOobeHandler() {
130 } 126 }
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 for (size_t i = 1; i < handlers_.size(); ++i) { 253 for (size_t i = 1; i < handlers_.size(); ++i) {
258 static_cast<BaseScreenHandler*>(handlers_[i])->InitializeBase(); 254 static_cast<BaseScreenHandler*>(handlers_[i])->InitializeBase();
259 } 255 }
260 } 256 }
261 257
262 void OobeUI::ShowSigninScreen() { 258 void OobeUI::ShowSigninScreen() {
263 signin_screen_handler_->Show(); 259 signin_screen_handler_->Show();
264 } 260 }
265 261
266 } // namespace chromeos 262 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/mock_login_ui_helpers.h ('k') | chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698