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

Side by Side Diff: content/browser/service_worker/service_worker_client_utils.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/service_worker/service_worker_client_utils.h" 5 #include "content/browser/service_worker/service_worker_client_utils.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <tuple> 8 #include <tuple>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 BrowserThread::PostTask( 190 BrowserThread::PostTask(
191 BrowserThread::IO, FROM_HERE, 191 BrowserThread::IO, FROM_HERE,
192 base::Bind(callback, ChildProcessHost::kInvalidUniqueID, 192 base::Bind(callback, ChildProcessHost::kInvalidUniqueID,
193 MSG_ROUTING_NONE)); 193 MSG_ROUTING_NONE));
194 return; 194 return;
195 } 195 }
196 196
197 OpenURLParams params( 197 OpenURLParams params(
198 url, Referrer::SanitizeForRequest( 198 url, Referrer::SanitizeForRequest(
199 url, Referrer(script_url, blink::WebReferrerPolicyDefault)), 199 url, Referrer(script_url, blink::WebReferrerPolicyDefault)),
200 NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, 200 WindowOpenDisposition::NEW_FOREGROUND_TAB,
201 true /* is_renderer_initiated */); 201 ui::PAGE_TRANSITION_AUTO_TOPLEVEL, true /* is_renderer_initiated */);
202 202
203 GetContentClient()->browser()->OpenURL(browser_context, params, 203 GetContentClient()->browser()->OpenURL(browser_context, params,
204 base::Bind(&DidOpenURLOnUI, callback)); 204 base::Bind(&DidOpenURLOnUI, callback));
205 } 205 }
206 206
207 void NavigateClientOnUI(const GURL& url, 207 void NavigateClientOnUI(const GURL& url,
208 const GURL& script_url, 208 const GURL& script_url,
209 int process_id, 209 int process_id,
210 int frame_id, 210 int frame_id,
211 const OpenURLCallback& callback) { 211 const OpenURLCallback& callback) {
(...skipping 11 matching lines...) Expand all
223 } 223 }
224 224
225 ui::PageTransition transition = rfhi->GetParent() 225 ui::PageTransition transition = rfhi->GetParent()
226 ? ui::PAGE_TRANSITION_AUTO_SUBFRAME 226 ? ui::PAGE_TRANSITION_AUTO_SUBFRAME
227 : ui::PAGE_TRANSITION_AUTO_TOPLEVEL; 227 : ui::PAGE_TRANSITION_AUTO_TOPLEVEL;
228 int frame_tree_node_id = rfhi->frame_tree_node()->frame_tree_node_id(); 228 int frame_tree_node_id = rfhi->frame_tree_node()->frame_tree_node_id();
229 229
230 OpenURLParams params( 230 OpenURLParams params(
231 url, Referrer::SanitizeForRequest( 231 url, Referrer::SanitizeForRequest(
232 url, Referrer(script_url, blink::WebReferrerPolicyDefault)), 232 url, Referrer(script_url, blink::WebReferrerPolicyDefault)),
233 frame_tree_node_id, CURRENT_TAB, transition, 233 frame_tree_node_id, WindowOpenDisposition::CURRENT_TAB, transition,
234 true /* is_renderer_initiated */); 234 true /* is_renderer_initiated */);
235 web_contents->OpenURL(params); 235 web_contents->OpenURL(params);
236 new OpenURLObserver(web_contents, frame_tree_node_id, callback); 236 new OpenURLObserver(web_contents, frame_tree_node_id, callback);
237 } 237 }
238 238
239 void DidNavigate(const base::WeakPtr<ServiceWorkerContextCore>& context, 239 void DidNavigate(const base::WeakPtr<ServiceWorkerContextCore>& context,
240 const GURL& origin, 240 const GURL& origin,
241 const NavigationCallback& callback, 241 const NavigationCallback& callback,
242 int render_process_id, 242 int render_process_id,
243 int render_frame_id) { 243 int render_frame_id) {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 GetWindowClients(controller, options, callback); 498 GetWindowClients(controller, options, callback);
499 return; 499 return;
500 } 500 }
501 501
502 GetNonWindowClients(controller, options, &clients); 502 GetNonWindowClients(controller, options, &clients);
503 DidGetClients(callback, &clients); 503 DidGetClients(callback, &clients);
504 } 504 }
505 505
506 } // namespace service_worker_client_utils 506 } // namespace service_worker_client_utils
507 } // namespace content 507 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/security_exploit_browsertest.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698