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

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: Created 8 years, 1 month 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 (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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 bool overridable, 138 bool overridable,
139 bool strict_enforcement, 139 bool strict_enforcement,
140 const base::Callback<void(bool)>& callback, 140 const base::Callback<void(bool)>& callback,
141 bool* cancel_request) OVERRIDE; 141 bool* cancel_request) OVERRIDE;
142 virtual void SelectClientCertificate( 142 virtual void SelectClientCertificate(
143 int render_process_id, 143 int render_process_id,
144 int render_view_id, 144 int render_view_id,
145 const net::HttpNetworkSession* network_session, 145 const net::HttpNetworkSession* network_session,
146 net::SSLCertRequestInfo* cert_request_info, 146 net::SSLCertRequestInfo* cert_request_info,
147 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 147 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
148 virtual void AddNewCertificate( 148 virtual void AddCertificates(
149 net::URLRequest* request, 149 net::URLRequest* request,
150 net::X509Certificate* cert, 150 net::CertificateType cert_type,
151 const void* cert_data,
152 size_t cert_size,
151 int render_process_id, 153 int render_process_id,
152 int render_view_id) OVERRIDE; 154 int render_view_id) OVERRIDE;
153 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; 155 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
154 virtual void RequestDesktopNotificationPermission( 156 virtual void RequestDesktopNotificationPermission(
155 const GURL& source_origin, 157 const GURL& source_origin,
156 int callback_context, 158 int callback_context,
157 int render_process_id, 159 int render_process_id,
158 int render_view_id) OVERRIDE; 160 int render_view_id) OVERRIDE;
159 virtual WebKit::WebNotificationPresenter::Permission 161 virtual WebKit::WebNotificationPresenter::Permission
160 CheckDesktopNotificationPermission( 162 CheckDesktopNotificationPermission(
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Cached version of the locale so we can return the locale on the I/O 241 // Cached version of the locale so we can return the locale on the I/O
240 // thread. 242 // thread.
241 std::string io_thread_application_locale_; 243 std::string io_thread_application_locale_;
242 244
243 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 245 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
244 }; 246 };
245 247
246 } // namespace chrome 248 } // namespace chrome
247 249
248 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 250 #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/chrome_content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698