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

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

Issue 16290004: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 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/json/string_escape.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/strings/string_piece.h" 10 #include "base/strings/string_piece.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // Origin should not include a trailing slash. That is part of the path. 66 // Origin should not include a trailing slash. That is part of the path.
67 TrimString(*origin, "/", origin); 67 TrimString(*origin, "/", origin);
68 return true; 68 return true;
69 } 69 }
70 70
71 void IframeSource::SendResource( 71 void IframeSource::SendResource(
72 int resource_id, 72 int resource_id,
73 const content::URLDataSource::GotDataCallback& callback) { 73 const content::URLDataSource::GotDataCallback& callback) {
74 scoped_refptr<base::RefCountedStaticMemory> response( 74 scoped_refptr<base::RefCountedStaticMemory> response(
75 ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id)); 75 ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id));
76 callback.Run(response); 76 callback.Run(response.get());
77 } 77 }
78 78
79 void IframeSource::SendJSWithOrigin( 79 void IframeSource::SendJSWithOrigin(
80 int resource_id, 80 int resource_id,
81 int render_process_id, 81 int render_process_id,
82 int render_view_id, 82 int render_view_id,
83 const content::URLDataSource::GotDataCallback& callback) { 83 const content::URLDataSource::GotDataCallback& callback) {
84 std::string origin; 84 std::string origin;
85 if (!GetOrigin(render_process_id, render_view_id, &origin)) { 85 if (!GetOrigin(render_process_id, render_view_id, &origin)) {
86 callback.Run(NULL); 86 callback.Run(NULL);
87 return; 87 return;
88 } 88 }
89 89
90 std::string js_escaped_origin; 90 std::string js_escaped_origin;
91 base::JsonDoubleQuote(origin, false, &js_escaped_origin); 91 base::JsonDoubleQuote(origin, false, &js_escaped_origin);
92 base::StringPiece template_js = 92 base::StringPiece template_js =
93 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); 93 ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
94 std::string response(template_js.as_string()); 94 std::string response(template_js.as_string());
95 ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin); 95 ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin);
96 callback.Run(base::RefCountedString::TakeString(&response)); 96 callback.Run(base::RefCountedString::TakeString(&response));
97 } 97 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/ui_manager.cc ('k') | chrome/browser/search/iframe_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698