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 #ifndef CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "content/public/browser/content_browser_client.h" | 10 #include "content/public/browser/content_browser_client.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 virtual std::string GetApplicationLocale() OVERRIDE; | 40 virtual std::string GetApplicationLocale() OVERRIDE; |
41 virtual void AllowCertificateError( | 41 virtual void AllowCertificateError( |
42 int render_process_id, | 42 int render_process_id, |
43 int render_view_id, | 43 int render_view_id, |
44 int cert_error, | 44 int cert_error, |
45 const net::SSLInfo& ssl_info, | 45 const net::SSLInfo& ssl_info, |
46 const GURL& request_url, | 46 const GURL& request_url, |
47 content::ResourceType resource_type, | 47 content::ResourceType resource_type, |
48 bool overridable, | 48 bool overridable, |
49 bool strict_enforcement, | 49 bool strict_enforcement, |
| 50 bool expired_previous_decision, |
50 const base::Callback<void(bool)>& callback, | 51 const base::Callback<void(bool)>& callback, |
51 content::CertificateRequestResultType* result) OVERRIDE; | 52 content::CertificateRequestResultType* result) OVERRIDE; |
52 virtual bool CanCreateWindow( | 53 virtual bool CanCreateWindow( |
53 const GURL& opener_url, | 54 const GURL& opener_url, |
54 const GURL& opener_top_level_frame_url, | 55 const GURL& opener_top_level_frame_url, |
55 const GURL& source_origin, | 56 const GURL& source_origin, |
56 WindowContainerType container_type, | 57 WindowContainerType container_type, |
57 const GURL& target_url, | 58 const GURL& target_url, |
58 const content::Referrer& referrer, | 59 const content::Referrer& referrer, |
59 WindowOpenDisposition disposition, | 60 WindowOpenDisposition disposition, |
(...skipping 15 matching lines...) Expand all Loading... |
75 CastBrowserMainParts* shell_browser_main_parts_; | 76 CastBrowserMainParts* shell_browser_main_parts_; |
76 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; | 77 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; |
77 | 78 |
78 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); | 79 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); |
79 }; | 80 }; |
80 | 81 |
81 } // namespace shell | 82 } // namespace shell |
82 } // namespace chromecast | 83 } // namespace chromecast |
83 | 84 |
84 #endif // CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ | 85 #endif // CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |