OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "content/public/browser/client_certificate_delegate.h" | 8 #include "content/public/browser/client_certificate_delegate.h" |
9 #include "ui/gfx/image/image_skia.h" | 9 #include "ui/gfx/image/image_skia.h" |
10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 const GURL& source_origin, | 237 const GURL& source_origin, |
238 WindowContainerType container_type, | 238 WindowContainerType container_type, |
239 const GURL& target_url, | 239 const GURL& target_url, |
240 const Referrer& referrer, | 240 const Referrer& referrer, |
241 WindowOpenDisposition disposition, | 241 WindowOpenDisposition disposition, |
242 const blink::WebWindowFeatures& features, | 242 const blink::WebWindowFeatures& features, |
243 bool user_gesture, | 243 bool user_gesture, |
244 bool opener_suppressed, | 244 bool opener_suppressed, |
245 ResourceContext* context, | 245 ResourceContext* context, |
246 int render_process_id, | 246 int render_process_id, |
247 int opener_id, | 247 int opener_render_view_id, |
| 248 int opener_render_frame_id, |
248 bool* no_javascript_access) { | 249 bool* no_javascript_access) { |
249 *no_javascript_access = false; | 250 *no_javascript_access = false; |
250 return true; | 251 return true; |
251 } | 252 } |
252 | 253 |
253 SpeechRecognitionManagerDelegate* | 254 SpeechRecognitionManagerDelegate* |
254 ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { | 255 ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { |
255 return nullptr; | 256 return nullptr; |
256 } | 257 } |
257 | 258 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 #if defined(VIDEO_HOLE) | 340 #if defined(VIDEO_HOLE) |
340 ExternalVideoSurfaceContainer* | 341 ExternalVideoSurfaceContainer* |
341 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 342 ContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
342 WebContents* web_contents) { | 343 WebContents* web_contents) { |
343 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; | 344 NOTREACHED() << "Hole-punching is not supported. See crbug.com/469348."; |
344 return nullptr; | 345 return nullptr; |
345 } | 346 } |
346 #endif | 347 #endif |
347 | 348 |
348 } // namespace content | 349 } // namespace content |
OLD | NEW |