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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 10381051: Show the "cannot proceed" text only when appropriate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <utility>
12 #include <vector>
Ryan Sleevi 2012/05/08 17:53:49 nit: sort
palmer 2012/05/08 18:40:43 It is sorted. :)
11 13
12 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
13 #include "content/public/browser/content_browser_client.h" 15 #include "content/public/browser/content_browser_client.h"
14 16
15 namespace content { 17 namespace content {
16 class QuotaPermissionContext; 18 class QuotaPermissionContext;
17 } 19 }
18 20
19 namespace chrome { 21 namespace chrome {
20 22
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 CreateQuotaPermissionContext() OVERRIDE; 100 CreateQuotaPermissionContext() OVERRIDE;
99 virtual void OpenItem(const FilePath& path) OVERRIDE; 101 virtual void OpenItem(const FilePath& path) OVERRIDE;
100 virtual void ShowItemInFolder(const FilePath& path) OVERRIDE; 102 virtual void ShowItemInFolder(const FilePath& path) OVERRIDE;
101 virtual void AllowCertificateError( 103 virtual void AllowCertificateError(
102 int render_process_id, 104 int render_process_id,
103 int render_view_id, 105 int render_view_id,
104 int cert_error, 106 int cert_error,
105 const net::SSLInfo& ssl_info, 107 const net::SSLInfo& ssl_info,
106 const GURL& request_url, 108 const GURL& request_url,
107 bool overridable, 109 bool overridable,
110 bool strict_enforcement,
108 const base::Callback<void(bool)>& callback, 111 const base::Callback<void(bool)>& callback,
109 bool* cancel_request) OVERRIDE; 112 bool* cancel_request) OVERRIDE;
110 virtual void SelectClientCertificate( 113 virtual void SelectClientCertificate(
111 int render_process_id, 114 int render_process_id,
112 int render_view_id, 115 int render_view_id,
113 const net::HttpNetworkSession* network_session, 116 const net::HttpNetworkSession* network_session,
114 net::SSLCertRequestInfo* cert_request_info, 117 net::SSLCertRequestInfo* cert_request_info,
115 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 118 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
116 virtual void AddNewCertificate( 119 virtual void AddNewCertificate(
117 net::URLRequest* request, 120 net::URLRequest* request,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 private: 191 private:
189 // Set of origins that can use TCP/UDP private APIs from NaCl. 192 // Set of origins that can use TCP/UDP private APIs from NaCl.
190 std::set<std::string> allowed_socket_origins_; 193 std::set<std::string> allowed_socket_origins_;
191 194
192 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 195 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
193 }; 196 };
194 197
195 } // namespace chrome 198 } // namespace chrome
196 199
197 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 200 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698