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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8584010: Adding base URL to the frame committed message. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced and disabled test (to figure-out EOL madness) Created 9 years, 1 month 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
« no previous file with comments | « content/public/common/frame_navigate_params.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 params.security_info = response.securityInfo(); 1052 params.security_info = response.securityInfo();
1053 } 1053 }
1054 1054
1055 // Set the URL to be displayed in the browser UI to the user. 1055 // Set the URL to be displayed in the browser UI to the user.
1056 if (ds->hasUnreachableURL()) { 1056 if (ds->hasUnreachableURL()) {
1057 params.url = ds->unreachableURL(); 1057 params.url = ds->unreachableURL();
1058 } else { 1058 } else {
1059 params.url = request.url(); 1059 params.url = request.url();
1060 } 1060 }
1061 1061
1062 if (frame->document().baseURL() != params.url)
1063 params.base_url = frame->document().baseURL();
1064
1062 GetRedirectChain(ds, &params.redirects); 1065 GetRedirectChain(ds, &params.redirects);
1063 params.should_update_history = !ds->hasUnreachableURL() && 1066 params.should_update_history = !ds->hasUnreachableURL() &&
1064 !response.isMultipartPayload() && (response.httpStatusCode() != 404); 1067 !response.isMultipartPayload() && (response.httpStatusCode() != 404);
1065 1068
1066 params.searchable_form_url = document_state->searchable_form_url(); 1069 params.searchable_form_url = document_state->searchable_form_url();
1067 params.searchable_form_encoding = 1070 params.searchable_form_encoding =
1068 document_state->searchable_form_encoding(); 1071 document_state->searchable_form_encoding();
1069 1072
1070 const PasswordForm* password_form_data = 1073 const PasswordForm* password_form_data =
1071 document_state->password_form_data(); 1074 document_state->password_form_data();
(...skipping 3649 matching lines...) Expand 10 before | Expand all | Expand 10 after
4721 return !!RenderThreadImpl::current()->compositor_thread(); 4724 return !!RenderThreadImpl::current()->compositor_thread();
4722 } 4725 }
4723 4726
4724 void RenderViewImpl::OnJavaBridgeInit( 4727 void RenderViewImpl::OnJavaBridgeInit(
4725 const IPC::ChannelHandle& channel_handle) { 4728 const IPC::ChannelHandle& channel_handle) {
4726 DCHECK(!java_bridge_dispatcher_.get()); 4729 DCHECK(!java_bridge_dispatcher_.get());
4727 #if defined(ENABLE_JAVA_BRIDGE) 4730 #if defined(ENABLE_JAVA_BRIDGE)
4728 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4731 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4729 #endif 4732 #endif
4730 } 4733 }
OLDNEW
« no previous file with comments | « content/public/common/frame_navigate_params.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698