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

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

Issue 2775963002: s/same_page/same_document for DidCommitProvisionalLoad method. (Closed)
Patch Set: Addressed review comment Created 3 years, 9 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/common/aw_hit_test_data.h" 5 #include "android_webview/common/aw_hit_test_data.h"
6 #include "android_webview/common/render_view_messages.h" 6 #include "android_webview/common/render_view_messages.h"
7 #include "android_webview/renderer/aw_render_frame_ext.h" 7 #include "android_webview/renderer/aw_render_frame_ext.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/renderer/android_content_detection_prefixes.h" 9 #include "content/public/renderer/android_content_detection_prefixes.h"
10 #include "content/public/renderer/document_state.h" 10 #include "content/public/renderer/document_state.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 } // namespace 133 } // namespace
134 134
135 AwRenderFrameExt::AwRenderFrameExt(content::RenderFrame* render_frame) 135 AwRenderFrameExt::AwRenderFrameExt(content::RenderFrame* render_frame)
136 : content::RenderFrameObserver(render_frame) { 136 : content::RenderFrameObserver(render_frame) {
137 } 137 }
138 138
139 AwRenderFrameExt::~AwRenderFrameExt() { 139 AwRenderFrameExt::~AwRenderFrameExt() {
140 } 140 }
141 141
142 void AwRenderFrameExt::DidCommitProvisionalLoad(bool is_new_navigation, 142 void AwRenderFrameExt::DidCommitProvisionalLoad(
143 bool is_same_page_navigation) { 143 bool is_new_navigation,
144 bool is_same_document_navigation) {
144 blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); 145 blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
145 content::DocumentState* document_state = 146 content::DocumentState* document_state =
146 content::DocumentState::FromDataSource(frame->dataSource()); 147 content::DocumentState::FromDataSource(frame->dataSource());
147 if (document_state->can_load_local_resources()) { 148 if (document_state->can_load_local_resources()) {
148 blink::WebSecurityOrigin origin = frame->document().getSecurityOrigin(); 149 blink::WebSecurityOrigin origin = frame->document().getSecurityOrigin();
149 origin.grantLoadLocalResources(); 150 origin.grantLoadLocalResources();
150 } 151 }
151 152
152 // Clear the cache when we cross site boundaries in the main frame. 153 // Clear the cache when we cross site boundaries in the main frame.
153 // 154 //
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 return nullptr; 302 return nullptr;
302 303
303 return render_frame()->GetRenderView()->GetWebFrameWidget(); 304 return render_frame()->GetRenderView()->GetWebFrameWidget();
304 } 305 }
305 306
306 void AwRenderFrameExt::OnDestruct() { 307 void AwRenderFrameExt::OnDestruct() {
307 delete this; 308 delete this;
308 } 309 }
309 310
310 } // namespace android_webview 311 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/renderer/aw_render_frame_ext.h ('k') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698