diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 01:12:22 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 01:12:22 +0000 |
| commit | 37567b43f9e0e76a4ca7704c99e7c41eb547e30f (patch) | |
| tree | fc0b0d96c10f3fb0c75adc55aa3f7e0db264545e /content/public | |
| parent | 284ffacb7c8a4eded2a4d28c4246fed84f0a8990 (diff) | |
| download | chromium_src-37567b43f9e0e76a4ca7704c99e7c41eb547e30f.zip chromium_src-37567b43f9e0e76a4ca7704c99e7c41eb547e30f.tar.gz chromium_src-37567b43f9e0e76a4ca7704c99e7c41eb547e30f.tar.bz2 | |
Move DidCommitProvisionalLoad code from RenderView to RenderFrame.
Another attempt at landing this. Original CL is https://codereview.chromium.org/135723003/ and patchset 1 is identical to it.
BUG=304341
Review URL: https://codereview.chromium.org/132743011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/browser/navigation_details.h | 4 | ||||
| -rw-r--r-- | content/public/browser/web_contents_observer.h | 1 | ||||
| -rw-r--r-- | content/public/test/render_view_test.cc | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/content/public/browser/navigation_details.h b/content/public/browser/navigation_details.h index 5a01aec..5103f64 100644 --- a/content/public/browser/navigation_details.h +++ b/content/public/browser/navigation_details.h @@ -51,8 +51,8 @@ struct CONTENT_EXPORT LoadCommittedDetails { // When the committed load is a web page from the renderer, this string // specifies the security state if the page is secure. - // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from. - // Use SSLManager::DeserializeSecurityInfo to decode it. + // See FrameHostMsg_DidCommitProvisionalLoad_Params.security_info, where it + // comes from. Use SSLManager::DeserializeSecurityInfo to decode it. std::string serialized_security_info; // Returns whether the main frame navigated to a different page (e.g., not diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h index 34cc96d..ae71eec 100644 --- a/content/public/browser/web_contents_observer.h +++ b/content/public/browser/web_contents_observer.h @@ -9,6 +9,7 @@ #include "base/process/process_handle.h" #include "content/common/content_export.h" #include "content/public/browser/navigation_controller.h" +#include "content/public/common/frame_navigate_params.h" #include "content/public/common/page_transition_types.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index 5de488b..7bc229e 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc @@ -6,6 +6,7 @@ #include "base/run_loop.h" #include "content/common/dom_storage/dom_storage_types.h" +#include "content/common/frame_messages.h" #include "content/common/input_messages.h" #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" @@ -334,7 +335,7 @@ void RenderViewTest::Reload(const GURL& url) { } uint32 RenderViewTest::GetNavigationIPCType() { - return ViewHostMsg_FrameNavigate::ID; + return FrameHostMsg_DidCommitProvisionalLoad::ID; } void RenderViewTest::Resize(gfx::Size new_size, |