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

Side by Side Diff: chrome/browser/search/iframe_source.cc

Issue 106793004: Revert of Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/iframe_source.h" 5 #include "chrome/browser/search/iframe_source.h"
6 6
7 #include "base/json/string_escape.h"
7 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
8 #include "base/strings/string_piece.h" 9 #include "base/strings/string_piece.h"
9 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
10 #include "chrome/browser/search/instant_io_context.h" 11 #include "chrome/browser/search/instant_io_context.h"
11 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
12 #include "content/public/browser/render_view_host.h" 13 #include "content/public/browser/render_view_host.h"
13 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
14 #include "grit/browser_resources.h" 15 #include "grit/browser_resources.h"
15 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
16 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 int resource_id, 80 int resource_id,
80 int render_process_id, 81 int render_process_id,
81 int render_view_id, 82 int render_view_id,
82 const content::URLDataSource::GotDataCallback& callback) { 83 const content::URLDataSource::GotDataCallback& callback) {
83 std::string origin; 84 std::string origin;
84 if (!GetOrigin(render_process_id, render_view_id, &origin)) { 85 if (!GetOrigin(render_process_id, render_view_id, &origin)) {
85 callback.Run(NULL); 86 callback.Run(NULL);
86 return; 87 return;
87 } 88 }
88 89
90 std::string js_escaped_origin;
91 base::JsonDoubleQuote(origin, false, &js_escaped_origin);
89 base::StringPiece template_js = 92 base::StringPiece template_js =
90 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); 93 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
91 std::string response(template_js.as_string()); 94 std::string response(template_js.as_string());
92 ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin); 95 ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin);
93 callback.Run(base::RefCountedString::TakeString(&response)); 96 callback.Run(base::RefCountedString::TakeString(&response));
94 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698