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

Side by Side Diff: chromecast/shell/browser/cast_content_browser_client.h

Issue 578373002: Interstitial options are not OR'd properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Changed API to pass options_mask through Created 6 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 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 27 matching lines...) Expand all
38 const GURL& url, 38 const GURL& url,
39 content::WebPreferences* prefs) OVERRIDE; 39 content::WebPreferences* prefs) OVERRIDE;
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 int options_mask,
49 bool strict_enforcement,
50 bool expired_previous_decision,
51 const base::Callback<void(bool)>& callback, 49 const base::Callback<void(bool)>& callback,
52 content::CertificateRequestResultType* result) OVERRIDE; 50 content::CertificateRequestResultType* result) OVERRIDE;
53 virtual bool CanCreateWindow( 51 virtual bool CanCreateWindow(
54 const GURL& opener_url, 52 const GURL& opener_url,
55 const GURL& opener_top_level_frame_url, 53 const GURL& opener_top_level_frame_url,
56 const GURL& source_origin, 54 const GURL& source_origin,
57 WindowContainerType container_type, 55 WindowContainerType container_type,
58 const GURL& target_url, 56 const GURL& target_url,
59 const content::Referrer& referrer, 57 const content::Referrer& referrer,
60 WindowOpenDisposition disposition, 58 WindowOpenDisposition disposition,
(...skipping 12 matching lines...) Expand all
73 private: 71 private:
74 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; 72 scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
75 73
76 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); 74 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
77 }; 75 };
78 76
79 } // namespace shell 77 } // namespace shell
80 } // namespace chromecast 78 } // namespace chromecast
81 79
82 #endif // CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 80 #endif // CHROMECAST_SHELL_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698