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

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

Issue 1315023004: PlzNavigate: Add parameters to navigation structures for ServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test following https://codereview.chromium.org/1320023005 Created 5 years, 3 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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 // done here either. 1702 // done here either.
1702 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) 1703 if (!common_params.url.SchemeIs(url::kJavaScriptScheme))
1703 frame_tree_node_->DidStartLoading(true); 1704 frame_tree_node_->DidStartLoading(true);
1704 } 1705 }
1705 1706
1706 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { 1707 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) {
1707 DCHECK(data_url.SchemeIs(url::kDataScheme)); 1708 DCHECK(data_url.SchemeIs(url::kDataScheme));
1708 CommonNavigationParams common_params( 1709 CommonNavigationParams common_params(
1709 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, 1710 data_url, Referrer(), ui::PAGE_TRANSITION_LINK,
1710 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), 1711 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(),
1711 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); 1712 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(),
1713 kInvalidServiceWorkerProviderId);
1712 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 1714 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1713 switches::kEnableBrowserSideNavigation)) { 1715 switches::kEnableBrowserSideNavigation)) {
1714 CommitNavigation(nullptr, nullptr, common_params, 1716 CommitNavigation(nullptr, nullptr, common_params,
1715 RequestNavigationParams()); 1717 RequestNavigationParams());
1716 } else { 1718 } else {
1717 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); 1719 Navigate(common_params, StartNavigationParams(), RequestNavigationParams());
1718 } 1720 }
1719 } 1721 }
1720 1722
1721 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, 1723 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params,
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
2229 BrowserPluginInstanceIDToAXTreeID(value))); 2231 BrowserPluginInstanceIDToAXTreeID(value)));
2230 break; 2232 break;
2231 case AX_CONTENT_INT_ATTRIBUTE_LAST: 2233 case AX_CONTENT_INT_ATTRIBUTE_LAST:
2232 NOTREACHED(); 2234 NOTREACHED();
2233 break; 2235 break;
2234 } 2236 }
2235 } 2237 }
2236 } 2238 }
2237 2239
2238 } // namespace content 2240 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698