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

Side by Side Diff: android_webview/renderer/aw_content_renderer_client.cc

Issue 151503006: Re-land r248110 with ASAN error fixed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Punctuation Created 6 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "android_webview/renderer/aw_content_renderer_client.h" 5 #include "android_webview/renderer/aw_content_renderer_client.h"
6 6
7 #include "android_webview/common/aw_resource.h" 7 #include "android_webview/common/aw_resource.h"
8 #include "android_webview/common/render_view_messages.h" 8 #include "android_webview/common/render_view_messages.h"
9 #include "android_webview/common/url_constants.h" 9 #include "android_webview/common/url_constants.h"
10 #include "android_webview/renderer/aw_key_systems.h" 10 #include "android_webview/renderer/aw_key_systems.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 void AwContentRendererClient::RenderViewCreated( 133 void AwContentRendererClient::RenderViewCreated(
134 content::RenderView* render_view) { 134 content::RenderView* render_view) {
135 AwRenderViewExt::RenderViewCreated(render_view); 135 AwRenderViewExt::RenderViewCreated(render_view);
136 136
137 new printing::PrintWebViewHelper(render_view); 137 new printing::PrintWebViewHelper(render_view);
138 // TODO(sgurun) do not create a password autofill agent (change 138 // TODO(sgurun) do not create a password autofill agent (change
139 // autofill agent to store a weakptr). 139 // autofill agent to store a weakptr).
140 autofill::PasswordAutofillAgent* password_autofill_agent = 140 autofill::PasswordAutofillAgent* password_autofill_agent =
141 new autofill::PasswordAutofillAgent(render_view); 141 new autofill::PasswordAutofillAgent(render_view);
142 new autofill::AutofillAgent(render_view, password_autofill_agent); 142 new autofill::AutofillAgent(render_view, password_autofill_agent, NULL);
143 } 143 }
144 144
145 std::string AwContentRendererClient::GetDefaultEncoding() { 145 std::string AwContentRendererClient::GetDefaultEncoding() {
146 return AwResource::GetDefaultTextEncoding(); 146 return AwResource::GetDefaultTextEncoding();
147 } 147 }
148 148
149 bool AwContentRendererClient::HasErrorPage(int http_status_code, 149 bool AwContentRendererClient::HasErrorPage(int http_status_code,
150 std::string* error_domain) { 150 std::string* error_domain) {
151 return http_status_code >= 400; 151 return http_status_code >= 400;
152 } 152 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) { 190 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
191 return visited_link_slave_->IsVisited(link_hash); 191 return visited_link_slave_->IsVisited(link_hash);
192 } 192 }
193 193
194 void AwContentRendererClient::AddKeySystems( 194 void AwContentRendererClient::AddKeySystems(
195 std::vector<content::KeySystemInfo>* key_systems) { 195 std::vector<content::KeySystemInfo>* key_systems) {
196 AwAddKeySystems(key_systems); 196 AwAddKeySystems(key_systems);
197 } 197 }
198 198
199 } // namespace android_webview 199 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698