summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 03:41:22 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-16 03:41:22 +0000
commitd9be477033ba5ca40bffd1d529ed65bcddedfb9a (patch)
treef6549203b7917c37f7fce9a7629de87abbcabaf4 /ui
parenteb5de1f0db80b2521d7ea29a6afdd22e6408e372 (diff)
downloadchromium_src-d9be477033ba5ca40bffd1d529ed65bcddedfb9a.zip
chromium_src-d9be477033ba5ca40bffd1d529ed65bcddedfb9a.tar.gz
chromium_src-d9be477033ba5ca40bffd1d529ed65bcddedfb9a.tar.bz2
Show the "cannot proceed" text only when appropriate.
Fix some simple lints while here. BUG=122498 Review URL: https://chromiumcodereview.appspot.com/10381051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/examples/content_client/examples_content_browser_client.cc1
-rw-r--r--ui/views/examples/content_client/examples_content_browser_client.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/ui/views/examples/content_client/examples_content_browser_client.cc b/ui/views/examples/content_client/examples_content_browser_client.cc
index 419171a..5b34348 100644
--- a/ui/views/examples/content_client/examples_content_browser_client.cc
+++ b/ui/views/examples/content_client/examples_content_browser_client.cc
@@ -204,6 +204,7 @@ void ExamplesContentBrowserClient::AllowCertificateError(
const net::SSLInfo& ssl_info,
const GURL& request_url,
bool overridable,
+ bool strict_enforcement,
const base::Callback<void(bool)>& callback,
bool* cancel_request) {
}
diff --git a/ui/views/examples/content_client/examples_content_browser_client.h b/ui/views/examples/content_client/examples_content_browser_client.h
index e7b2ccd..1cabd5f 100644
--- a/ui/views/examples/content_client/examples_content_browser_client.h
+++ b/ui/views/examples/content_client/examples_content_browser_client.h
@@ -111,6 +111,7 @@ class ExamplesContentBrowserClient : public content::ContentBrowserClient {
const net::SSLInfo& ssl_info,
const GURL& request_url,
bool overridable,
+ bool strict_enforcement,
const base::Callback<void(bool)>& callback,
bool* cancel_request) OVERRIDE;
virtual void SelectClientCertificate(