Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 5068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5079 if (pending_navigation_params_) { | 5079 if (pending_navigation_params_) { |
| 5080 pending_navigation_params_->common_params.navigation_start = | 5080 pending_navigation_params_->common_params.navigation_start = |
| 5081 base::TimeTicks::Now(); | 5081 base::TimeTicks::Now(); |
| 5082 } | 5082 } |
| 5083 } | 5083 } |
| 5084 | 5084 |
| 5085 // PlzNavigate: if the navigation is not synchronous, send it to the browser. | 5085 // PlzNavigate: if the navigation is not synchronous, send it to the browser. |
| 5086 // This includes navigations with no request being sent to the network stack. | 5086 // This includes navigations with no request being sent to the network stack. |
| 5087 if (IsBrowserSideNavigationEnabled() && | 5087 if (IsBrowserSideNavigationEnabled() && |
| 5088 info.urlRequest.checkForBrowserSideNavigation() && | 5088 info.urlRequest.checkForBrowserSideNavigation() && |
| 5089 ShouldMakeNetworkRequestForURL(url)) { | 5089 ShouldMakeNetworkRequestForURL(url) && |
| 5090 info.defaultPolicy == blink::WebNavigationPolicyCurrentTab) { | |
|
clamy
2016/09/09 15:28:01
I think we should still have a special case for Pl
| |
| 5090 BeginNavigation(info); | 5091 BeginNavigation(info); |
| 5091 return blink::WebNavigationPolicyHandledByClient; | 5092 return blink::WebNavigationPolicyHandledByClient; |
| 5092 } | 5093 } |
| 5093 | 5094 |
| 5094 return info.defaultPolicy; | 5095 return info.defaultPolicy; |
| 5095 } | 5096 } |
| 5096 | 5097 |
| 5097 void RenderFrameImpl::OnGetSavableResourceLinks() { | 5098 void RenderFrameImpl::OnGetSavableResourceLinks() { |
| 5098 std::vector<GURL> resources_list; | 5099 std::vector<GURL> resources_list; |
| 5099 std::vector<SavableSubframe> subframes; | 5100 std::vector<SavableSubframe> subframes; |
| (...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6340 // event target. Potentially a Pepper plugin will receive the event. | 6341 // event target. Potentially a Pepper plugin will receive the event. |
| 6341 // In order to tell whether a plugin gets the last mouse event and which it | 6342 // In order to tell whether a plugin gets the last mouse event and which it |
| 6342 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6343 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6343 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6344 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6344 // |pepper_last_mouse_event_target_|. | 6345 // |pepper_last_mouse_event_target_|. |
| 6345 pepper_last_mouse_event_target_ = nullptr; | 6346 pepper_last_mouse_event_target_ = nullptr; |
| 6346 #endif | 6347 #endif |
| 6347 } | 6348 } |
| 6348 | 6349 |
| 6349 } // namespace content | 6350 } // namespace content |
| OLD | NEW |