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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 21388003: Move routing to RenderFrameHost instead of RenderViewHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move global map to .cc file. Created 7 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 if (!msg_is_ok) { 1009 if (!msg_is_ok) {
1010 // The message had a handler, but its de-serialization failed. 1010 // The message had a handler, but its de-serialization failed.
1011 // Kill the renderer. 1011 // Kill the renderer.
1012 RecordAction(UserMetricsAction("BadMessageTerminate_RVH")); 1012 RecordAction(UserMetricsAction("BadMessageTerminate_RVH"));
1013 GetProcess()->ReceivedBadMessage(); 1013 GetProcess()->ReceivedBadMessage();
1014 } 1014 }
1015 1015
1016 return handled; 1016 return handled;
1017 } 1017 }
1018 1018
1019 void RenderViewHostImpl::Init() {
1020 RenderWidgetHostImpl::Init();
1021 GetProcess()->ResumeRequestsForView(main_render_frame_host_->GetRoutingID());
1022 }
1023
1019 void RenderViewHostImpl::Shutdown() { 1024 void RenderViewHostImpl::Shutdown() {
1020 // If we are being run modally (see RunModal), then we need to cleanup. 1025 // If we are being run modally (see RunModal), then we need to cleanup.
1021 if (run_modal_reply_msg_) { 1026 if (run_modal_reply_msg_) {
1022 Send(run_modal_reply_msg_); 1027 Send(run_modal_reply_msg_);
1023 run_modal_reply_msg_ = NULL; 1028 run_modal_reply_msg_ = NULL;
1024 RenderViewHostImpl* opener = 1029 RenderViewHostImpl* opener =
1025 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_); 1030 RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_);
1026 if (opener) { 1031 if (opener) {
1027 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds( 1032 opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
1028 hung_renderer_delay_ms_)); 1033 hung_renderer_delay_ms_));
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles(); 2056 const std::vector<base::FilePath>& file_paths = state.GetReferencedFiles();
2052 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin(); 2057 for (std::vector<base::FilePath>::const_iterator file = file_paths.begin();
2053 file != file_paths.end(); ++file) { 2058 file != file_paths.end(); ++file) {
2054 if (!policy->CanReadFile(GetProcess()->GetID(), *file)) 2059 if (!policy->CanReadFile(GetProcess()->GetID(), *file))
2055 return false; 2060 return false;
2056 } 2061 }
2057 return true; 2062 return true;
2058 } 2063 }
2059 2064
2060 } // namespace content 2065 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/renderer_host/render_widget_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698