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

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

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: separate android and openssl CertDatabase implementations Created 8 years 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 bool overridable, 145 bool overridable,
146 bool strict_enforcement, 146 bool strict_enforcement,
147 const base::Callback<void(bool)>& callback, 147 const base::Callback<void(bool)>& callback,
148 bool* cancel_request) OVERRIDE; 148 bool* cancel_request) OVERRIDE;
149 virtual void SelectClientCertificate( 149 virtual void SelectClientCertificate(
150 int render_process_id, 150 int render_process_id,
151 int render_view_id, 151 int render_view_id,
152 const net::HttpNetworkSession* network_session, 152 const net::HttpNetworkSession* network_session,
153 net::SSLCertRequestInfo* cert_request_info, 153 net::SSLCertRequestInfo* cert_request_info,
154 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 154 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
155 virtual void AddNewCertificate( 155 virtual void AddCertificate(
156 net::URLRequest* request, 156 net::URLRequest* request,
157 net::X509Certificate* cert, 157 net::CertificateMimeType cert_type,
158 const void* cert_data,
159 size_t cert_size,
158 int render_process_id, 160 int render_process_id,
159 int render_view_id) OVERRIDE; 161 int render_view_id) OVERRIDE;
160 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 162 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
161 virtual void RequestDesktopNotificationPermission( 163 virtual void RequestDesktopNotificationPermission(
162 const GURL& source_origin, 164 const GURL& source_origin,
163 int callback_context, 165 int callback_context,
164 int render_process_id, 166 int render_process_id,
165 int render_view_id) OVERRIDE; 167 int render_view_id) OVERRIDE;
166 virtual WebKit::WebNotificationPresenter::Permission 168 virtual WebKit::WebNotificationPresenter::Permission
167 CheckDesktopNotificationPermission( 169 CheckDesktopNotificationPermission(
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 // Cached version of the locale so we can return the locale on the I/O 252 // Cached version of the locale so we can return the locale on the I/O
251 // thread. 253 // thread.
252 std::string io_thread_application_locale_; 254 std::string io_thread_application_locale_;
253 255
254 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 256 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
255 }; 257 };
256 258
257 } // namespace chrome 259 } // namespace chrome
258 260
259 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 261 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698