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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1294243004: PlzNavigate: Make ServiceWorker work with PlzNavigate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style, placeholders, all that stuff Created 5 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
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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 29 matching lines...) Expand all
40 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 40 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
41 #include "content/browser/renderer_host/render_view_host_impl.h" 41 #include "content/browser/renderer_host/render_view_host_impl.h"
42 #include "content/browser/renderer_host/render_widget_host_impl.h" 42 #include "content/browser/renderer_host/render_widget_host_impl.h"
43 #include "content/browser/renderer_host/render_widget_host_view_base.h" 43 #include "content/browser/renderer_host/render_widget_host_view_base.h"
44 #include "content/common/accessibility_messages.h" 44 #include "content/common/accessibility_messages.h"
45 #include "content/common/frame_messages.h" 45 #include "content/common/frame_messages.h"
46 #include "content/common/input_messages.h" 46 #include "content/common/input_messages.h"
47 #include "content/common/inter_process_time_ticks_converter.h" 47 #include "content/common/inter_process_time_ticks_converter.h"
48 #include "content/common/navigation_params.h" 48 #include "content/common/navigation_params.h"
49 #include "content/common/render_frame_setup.mojom.h" 49 #include "content/common/render_frame_setup.mojom.h"
50 #include "content/common/service_worker/service_worker_types.h"
50 #include "content/common/site_isolation_policy.h" 51 #include "content/common/site_isolation_policy.h"
51 #include "content/common/swapped_out_messages.h" 52 #include "content/common/swapped_out_messages.h"
52 #include "content/public/browser/ax_event_notification_details.h" 53 #include "content/public/browser/ax_event_notification_details.h"
53 #include "content/public/browser/browser_accessibility_state.h" 54 #include "content/public/browser/browser_accessibility_state.h"
54 #include "content/public/browser/browser_context.h" 55 #include "content/public/browser/browser_context.h"
55 #include "content/public/browser/browser_plugin_guest_manager.h" 56 #include "content/public/browser/browser_plugin_guest_manager.h"
56 #include "content/public/browser/browser_thread.h" 57 #include "content/public/browser/browser_thread.h"
57 #include "content/public/browser/content_browser_client.h" 58 #include "content/public/browser/content_browser_client.h"
58 #include "content/public/browser/permission_manager.h" 59 #include "content/public/browser/permission_manager.h"
59 #include "content/public/browser/permission_type.h" 60 #include "content/public/browser/permission_type.h"
(...skipping 1645 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 // Blink doesn't send throb notifications for JavaScript URLs, so it is not 1706 // Blink doesn't send throb notifications for JavaScript URLs, so it is not
1706 // done here either. 1707 // done here either.
1707 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) 1708 if (!common_params.url.SchemeIs(url::kJavaScriptScheme))
1708 frame_tree_node_->DidStartLoading(true); 1709 frame_tree_node_->DidStartLoading(true);
1709 } 1710 }
1710 1711
1711 void RenderFrameHostImpl::NavigateToURL(const GURL& url) { 1712 void RenderFrameHostImpl::NavigateToURL(const GURL& url) {
1712 CommonNavigationParams common_params( 1713 CommonNavigationParams common_params(
1713 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL, 1714 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL,
1714 true, false, base::TimeTicks::Now(), 1715 true, false, base::TimeTicks::Now(),
1715 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); 1716 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(),
1717 kInvalidServiceWorkerProviderId);
1716 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); 1718 Navigate(common_params, StartNavigationParams(), RequestNavigationParams());
1717 } 1719 }
1718 1720
1719 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, 1721 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params,
1720 SiteInstance* source_site_instance) { 1722 SiteInstance* source_site_instance) {
1721 GURL validated_url(params.url); 1723 GURL validated_url(params.url);
1722 GetProcess()->FilterURL(false, &validated_url); 1724 GetProcess()->FilterURL(false, &validated_url);
1723 1725
1724 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url", 1726 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url",
1725 validated_url.possibly_invalid_spec()); 1727 validated_url.possibly_invalid_spec());
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
2215 BrowserPluginInstanceIDToAXTreeID(value))); 2217 BrowserPluginInstanceIDToAXTreeID(value)));
2216 break; 2218 break;
2217 case AX_CONTENT_INT_ATTRIBUTE_LAST: 2219 case AX_CONTENT_INT_ATTRIBUTE_LAST:
2218 NOTREACHED(); 2220 NOTREACHED();
2219 break; 2221 break;
2220 } 2222 }
2221 } 2223 }
2222 } 2224 }
2223 2225
2224 } // namespace content 2226 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698