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 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
466 | 466 |
467 // Request permission to access protected media identifier. |result_callback | 467 // Request permission to access protected media identifier. |result_callback |
468 // will tell whether it's permitted. If |cancel_callback| is non-null, it's | 468 // will tell whether it's permitted. If |cancel_callback| is non-null, it's |
469 // set to a callback which can be used to cancel the permission request. | 469 // set to a callback which can be used to cancel the permission request. |
470 virtual void RequestProtectedMediaIdentifierPermission( | 470 virtual void RequestProtectedMediaIdentifierPermission( |
471 WebContents* web_contents, | 471 WebContents* web_contents, |
472 const GURL& origin, | 472 const GURL& origin, |
473 base::Callback<void(bool)> result_callback, | 473 base::Callback<void(bool)> result_callback, |
474 base::Closure* cancel_callback); | 474 base::Closure* cancel_callback); |
475 | 475 |
476 // Informs the content settings host map that a permission has been used. | |
Michael van Ouwerkerk
2014/07/01 11:02:24
I don't think you can refer to the host map here a
Daniel Nishi
2014/07/01 18:37:48
Done.
| |
477 virtual void UseContentSettingPermission(content::WebContents* web_contents, | |
478 const GURL& primary_url, | |
479 const GURL& secondary_url, | |
480 const std::string& setting_type); | |
481 | |
476 // Returns true if the given page is allowed to open a window of the given | 482 // Returns true if the given page is allowed to open a window of the given |
477 // type. If true is returned, |no_javascript_access| will indicate whether | 483 // type. If true is returned, |no_javascript_access| will indicate whether |
478 // the window that is created should be scriptable/in the same process. | 484 // the window that is created should be scriptable/in the same process. |
479 // This is called on the IO thread. | 485 // This is called on the IO thread. |
480 virtual bool CanCreateWindow(const GURL& opener_url, | 486 virtual bool CanCreateWindow(const GURL& opener_url, |
481 const GURL& opener_top_level_frame_url, | 487 const GURL& opener_top_level_frame_url, |
482 const GURL& source_origin, | 488 const GURL& source_origin, |
483 WindowContainerType container_type, | 489 WindowContainerType container_type, |
484 const GURL& target_url, | 490 const GURL& target_url, |
485 const Referrer& referrer, | 491 const Referrer& referrer, |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
647 // Allows an embedder to provide its own ExternalVideoSurfaceContainer | 653 // Allows an embedder to provide its own ExternalVideoSurfaceContainer |
648 // implementation. Return NULL to disable external surface video. | 654 // implementation. Return NULL to disable external surface video. |
649 virtual ExternalVideoSurfaceContainer* | 655 virtual ExternalVideoSurfaceContainer* |
650 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); | 656 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); |
651 #endif | 657 #endif |
652 }; | 658 }; |
653 | 659 |
654 } // namespace content | 660 } // namespace content |
655 | 661 |
656 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 662 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |