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

Side by Side Diff: ash/shell/content_client/shell_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
« no previous file with comments | « no previous file | ash/shell/content_client/shell_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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 CreateQuotaPermissionContext() OVERRIDE; 104 CreateQuotaPermissionContext() OVERRIDE;
105 virtual void OpenItem(const FilePath& path) OVERRIDE; 105 virtual void OpenItem(const FilePath& path) OVERRIDE;
106 virtual void ShowItemInFolder(const FilePath& path) OVERRIDE; 106 virtual void ShowItemInFolder(const FilePath& path) OVERRIDE;
107 virtual void AllowCertificateError( 107 virtual void AllowCertificateError(
108 int render_process_id, 108 int render_process_id,
109 int render_view_id, 109 int render_view_id,
110 int cert_error, 110 int cert_error,
111 const net::SSLInfo& ssl_info, 111 const net::SSLInfo& ssl_info,
112 const GURL& request_url, 112 const GURL& request_url,
113 bool overridable, 113 bool overridable,
114 bool strict_enforcement,
114 const base::Callback<void(bool)>& callback, 115 const base::Callback<void(bool)>& callback,
115 bool* cancel_request) OVERRIDE; 116 bool* cancel_request) OVERRIDE;
116 virtual void SelectClientCertificate( 117 virtual void SelectClientCertificate(
117 int render_process_id, 118 int render_process_id,
118 int render_view_id, 119 int render_view_id,
119 const net::HttpNetworkSession* network_session, 120 const net::HttpNetworkSession* network_session,
120 net::SSLCertRequestInfo* cert_request_info, 121 net::SSLCertRequestInfo* cert_request_info,
121 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 122 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
122 virtual void AddNewCertificate( 123 virtual void AddNewCertificate(
123 net::URLRequest* request, 124 net::URLRequest* request,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 202
202 ShellBrowserMainParts* shell_browser_main_parts_; 203 ShellBrowserMainParts* shell_browser_main_parts_;
203 204
204 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 205 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
205 }; 206 };
206 207
207 } // namespace shell 208 } // namespace shell
208 } // namespace ash 209 } // namespace ash
209 210
210 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 211 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell/content_client/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698