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

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

Issue 2808953002: Revert of Followup comments from r460581. (Closed)
Patch Set: manual merge Created 3 years, 8 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 | « content/common/frame_messages.h ('k') | content/test/data/page_with_empty_beforeunload.html » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4737 matching lines...) Expand 10 before | Expand all | Expand 10 after
4748 void RenderFrameImpl::SuddenTerminationDisablerChanged( 4748 void RenderFrameImpl::SuddenTerminationDisablerChanged(
4749 bool present, 4749 bool present,
4750 blink::WebFrameClient::SuddenTerminationDisablerType type) { 4750 blink::WebFrameClient::SuddenTerminationDisablerType type) {
4751 switch (type) { 4751 switch (type) {
4752 case blink::WebFrameClient::kBeforeUnloadHandler: 4752 case blink::WebFrameClient::kBeforeUnloadHandler:
4753 Send(new FrameHostMsg_BeforeUnloadHandlersPresent(routing_id_, present)); 4753 Send(new FrameHostMsg_BeforeUnloadHandlersPresent(routing_id_, present));
4754 break; 4754 break;
4755 case blink::WebFrameClient::kUnloadHandler: 4755 case blink::WebFrameClient::kUnloadHandler:
4756 Send(new FrameHostMsg_UnloadHandlersPresent(routing_id_, present)); 4756 Send(new FrameHostMsg_UnloadHandlersPresent(routing_id_, present));
4757 break; 4757 break;
4758 default:
4759 NOTREACHED();
4758 } 4760 }
4759 } 4761 }
4760 4762
4761 void RenderFrameImpl::RegisterProtocolHandler(const WebString& scheme, 4763 void RenderFrameImpl::RegisterProtocolHandler(const WebString& scheme,
4762 const WebURL& url, 4764 const WebURL& url,
4763 const WebString& title) { 4765 const WebString& title) {
4764 bool user_gesture = WebUserGestureIndicator::IsProcessingUserGesture(); 4766 bool user_gesture = WebUserGestureIndicator::IsProcessingUserGesture();
4765 Send(new FrameHostMsg_RegisterProtocolHandler(routing_id_, scheme.Utf8(), url, 4767 Send(new FrameHostMsg_RegisterProtocolHandler(routing_id_, scheme.Utf8(), url,
4766 title.Utf16(), user_gesture)); 4768 title.Utf16(), user_gesture));
4767 } 4769 }
(...skipping 2207 matching lines...) Expand 10 before | Expand all | Expand 10 after
6975 policy(info.default_policy), 6977 policy(info.default_policy),
6976 replaces_current_history_item(info.replaces_current_history_item), 6978 replaces_current_history_item(info.replaces_current_history_item),
6977 history_navigation_in_new_child_frame( 6979 history_navigation_in_new_child_frame(
6978 info.is_history_navigation_in_new_child_frame), 6980 info.is_history_navigation_in_new_child_frame),
6979 client_redirect(info.is_client_redirect), 6981 client_redirect(info.is_client_redirect),
6980 cache_disabled(info.is_cache_disabled), 6982 cache_disabled(info.is_cache_disabled),
6981 form(info.form), 6983 form(info.form),
6982 source_location(info.source_location) {} 6984 source_location(info.source_location) {}
6983 6985
6984 } // namespace content 6986 } // namespace content
OLDNEW
« no previous file with comments | « content/common/frame_messages.h ('k') | content/test/data/page_with_empty_beforeunload.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698