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

Side by Side Diff: chrome/browser/ssl/ssl_manager.h

Issue 6044006: Remove wstring from l10n_util. Part 3.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_SSL_SSL_MANAGER_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_MANAGER_H_
6 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_ 6 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
13 #include "base/string16.h"
13 #include "chrome/browser/ssl/ssl_policy_backend.h" 14 #include "chrome/browser/ssl/ssl_policy_backend.h"
14 #include "chrome/common/notification_observer.h" 15 #include "chrome/common/notification_observer.h"
15 #include "chrome/common/notification_registrar.h" 16 #include "chrome/common/notification_registrar.h"
16 #include "googleurl/src/gurl.h" 17 #include "googleurl/src/gurl.h"
17 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
18 19
19 class LoadFromMemoryCacheDetails; 20 class LoadFromMemoryCacheDetails;
20 class NavigationController; 21 class NavigationController;
21 class NavigationEntry; 22 class NavigationEntry;
22 class ProvisionalLoadDetails; 23 class ProvisionalLoadDetails;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 int cert_status, 60 int cert_status,
60 int security_bits, 61 int security_bits,
61 int connection_status); 62 int connection_status);
62 static bool DeserializeSecurityInfo(const std::string& state, 63 static bool DeserializeSecurityInfo(const std::string& state,
63 int* cert_id, 64 int* cert_id,
64 int* cert_status, 65 int* cert_status,
65 int* security_bits, 66 int* security_bits,
66 int* connection_status); 67 int* connection_status);
67 68
68 // Returns "<organization_name> [<country>]". 69 // Returns "<organization_name> [<country>]".
69 static std::wstring GetEVCertName(const net::X509Certificate& cert); 70 static string16 GetEVCertName(const net::X509Certificate& cert);
70 71
71 // Construct an SSLManager for the specified tab. 72 // Construct an SSLManager for the specified tab.
72 // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used. 73 // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
73 explicit SSLManager(NavigationController* controller); 74 explicit SSLManager(NavigationController* controller);
74 ~SSLManager(); 75 ~SSLManager();
75 76
76 SSLPolicy* policy() { return policy_.get(); } 77 SSLPolicy* policy() { return policy_.get(); }
77 SSLPolicyBackend* backend() { return &backend_; } 78 SSLPolicyBackend* backend() { return &backend_; }
78 79
79 // The navigation controller associated with this SSLManager. The 80 // The navigation controller associated with this SSLManager. The
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // for the security UI of this tab. 123 // for the security UI of this tab.
123 NavigationController* controller_; 124 NavigationController* controller_;
124 125
125 // Handles registering notifications with the NotificationService. 126 // Handles registering notifications with the NotificationService.
126 NotificationRegistrar registrar_; 127 NotificationRegistrar registrar_;
127 128
128 DISALLOW_COPY_AND_ASSIGN(SSLManager); 129 DISALLOW_COPY_AND_ASSIGN(SSLManager);
129 }; 130 };
130 131
131 #endif // CHROME_BROWSER_SSL_SSL_MANAGER_H_ 132 #endif // CHROME_BROWSER_SSL_SSL_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698