OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h" | 5 #include "chromecast/browser/cast_content_browser_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 } else { | 386 } else { |
387 LOG(ERROR) << "Invalid host for client certificate request: " | 387 LOG(ERROR) << "Invalid host for client certificate request: " |
388 << requesting_url.host() | 388 << requesting_url.host() |
389 << " with render_process_id: " | 389 << " with render_process_id: " |
390 << render_process_id; | 390 << render_process_id; |
391 return NULL; | 391 return NULL; |
392 } | 392 } |
393 } | 393 } |
394 | 394 |
395 bool CastContentBrowserClient::CanCreateWindow( | 395 bool CastContentBrowserClient::CanCreateWindow( |
| 396 int opener_render_process_id, |
| 397 int opener_render_frame_id, |
396 const GURL& opener_url, | 398 const GURL& opener_url, |
397 const GURL& opener_top_level_frame_url, | 399 const GURL& opener_top_level_frame_url, |
398 const GURL& source_origin, | 400 const GURL& source_origin, |
399 WindowContainerType container_type, | 401 WindowContainerType container_type, |
400 const GURL& target_url, | 402 const GURL& target_url, |
401 const content::Referrer& referrer, | 403 const content::Referrer& referrer, |
402 const std::string& frame_name, | 404 const std::string& frame_name, |
403 WindowOpenDisposition disposition, | 405 WindowOpenDisposition disposition, |
404 const blink::WebWindowFeatures& features, | 406 const blink::WebWindowFeatures& features, |
405 bool user_gesture, | 407 bool user_gesture, |
406 bool opener_suppressed, | 408 bool opener_suppressed, |
407 content::ResourceContext* context, | 409 content::ResourceContext* context, |
408 int render_process_id, | |
409 int opener_render_view_id, | |
410 int opener_render_frame_id, | |
411 bool* no_javascript_access) { | 410 bool* no_javascript_access) { |
412 *no_javascript_access = true; | 411 *no_javascript_access = true; |
413 return false; | 412 return false; |
414 } | 413 } |
415 | 414 |
416 void CastContentBrowserClient::ExposeInterfacesToRenderer( | 415 void CastContentBrowserClient::ExposeInterfacesToRenderer( |
417 service_manager::InterfaceRegistry* registry, | 416 service_manager::InterfaceRegistry* registry, |
418 content::RenderProcessHost* render_process_host) { | 417 content::RenderProcessHost* render_process_host) { |
419 registry->AddInterface( | 418 registry->AddInterface( |
420 base::Bind(&media::MediaCapsImpl::AddBinding, | 419 base::Bind(&media::MediaCapsImpl::AddBinding, |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 process_type, dumps_path, false /* upload */); | 545 process_type, dumps_path, false /* upload */); |
547 // StartUploaderThread() even though upload is diferred. | 546 // StartUploaderThread() even though upload is diferred. |
548 // Breakpad-related memory is freed in the uploader thread. | 547 // Breakpad-related memory is freed in the uploader thread. |
549 crash_handler->StartUploaderThread(); | 548 crash_handler->StartUploaderThread(); |
550 return crash_handler; | 549 return crash_handler; |
551 } | 550 } |
552 #endif // !defined(OS_ANDROID) | 551 #endif // !defined(OS_ANDROID) |
553 | 552 |
554 } // namespace shell | 553 } // namespace shell |
555 } // namespace chromecast | 554 } // namespace chromecast |
OLD | NEW |