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

Side by Side Diff: ash/shell/content_client/shell_content_browser_client.cc

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 #include "ash/shell/content_client/shell_content_browser_client.h" 5 #include "ash/shell/content_client/shell_content_browser_client.h"
6 6
7 #include "ash/shell/content_client/shell_browser_main_parts.h" 7 #include "ash/shell/content_client/shell_browser_main_parts.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "content/public/browser/resource_dispatcher_host.h" 10 #include "content/public/browser/resource_dispatcher_host.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 void ShellContentBrowserClient::ShowItemInFolder(const FilePath& path) { 197 void ShellContentBrowserClient::ShowItemInFolder(const FilePath& path) {
198 } 198 }
199 199
200 void ShellContentBrowserClient::AllowCertificateError( 200 void ShellContentBrowserClient::AllowCertificateError(
201 int render_process_id, 201 int render_process_id,
202 int render_view_id, 202 int render_view_id,
203 int cert_error, 203 int cert_error,
204 const net::SSLInfo& ssl_info, 204 const net::SSLInfo& ssl_info,
205 const GURL& request_url, 205 const GURL& request_url,
206 bool overridable, 206 bool overridable,
207 bool strict_enforcement,
207 const base::Callback<void(bool)>& callback, 208 const base::Callback<void(bool)>& callback,
208 bool* cancel_request) { 209 bool* cancel_request) {
209 } 210 }
210 211
211 void ShellContentBrowserClient::SelectClientCertificate( 212 void ShellContentBrowserClient::SelectClientCertificate(
212 int render_process_id, 213 int render_process_id,
213 int render_view_id, 214 int render_view_id,
214 const net::HttpNetworkSession* network_session, 215 const net::HttpNetworkSession* network_session,
215 net::SSLCertRequestInfo* cert_request_info, 216 net::SSLCertRequestInfo* cert_request_info,
216 const base::Callback<void(net::X509Certificate*)>& callback) { 217 const base::Callback<void(net::X509Certificate*)>& callback) {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 return NULL; 365 return NULL;
365 } 366 }
366 #endif 367 #endif
367 368
368 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() { 369 content::ShellBrowserContext* ShellContentBrowserClient::browser_context() {
369 return shell_browser_main_parts_->browser_context(); 370 return shell_browser_main_parts_->browser_context();
370 } 371 }
371 372
372 } // namespace examples 373 } // namespace examples
373 } // namespace views 374 } // namespace views
OLDNEW
« no previous file with comments | « ash/shell/content_client/shell_content_browser_client.h ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698