Commit c4230199 authored by hans@chromium.org's avatar hans@chromium.org

Clean-up inline members of nested classes (chrome/browser/chromeos/)

Due to a bug, the Clang-plugin style checker failed to warn about
inline constructors, destructors, non-empty virtual methods, etc.
for nested classes.

The plugin has been fixed, and this patch is part of a clean-up of all
the code that now causes the plugin to issue errors.

BUG=139346


Review URL: https://chromiumcodereview.appspot.com/10826225

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151014 0039d316-1c4b-4281-b951-d872f2087c98
parent d310bfc8
...@@ -535,6 +535,12 @@ CertLibrary* CertLibrary::GetImpl(bool stub) { ...@@ -535,6 +535,12 @@ CertLibrary* CertLibrary::GetImpl(bool stub) {
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
CertLibrary::CertList::CertList(CertLibrary* library)
: cert_library_(library) {
}
CertLibrary::CertList::~CertList() {}
net::X509Certificate* CertLibrary::CertList::GetCertificateAt(int index) const { net::X509Certificate* CertLibrary::CertList::GetCertificateAt(int index) const {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK_GE(index, 0); DCHECK_GE(index, 0);
......
...@@ -40,8 +40,8 @@ class CertLibrary { ...@@ -40,8 +40,8 @@ class CertLibrary {
// Wrapper class to provide an additional interface for net::CertificateList. // Wrapper class to provide an additional interface for net::CertificateList.
class CertList { class CertList {
public: public:
explicit CertList(CertLibrary* library) : cert_library_(library) {} explicit CertList(CertLibrary* library);
~CertList() {} ~CertList();
void Append(net::X509Certificate* cert) { list_.push_back(cert); } void Append(net::X509Certificate* cert) { list_.push_back(cert); }
void Clear() { list_.clear(); } void Clear() { list_.clear(); }
int Size() const { return static_cast<int>(list_.size()); } int Size() const { return static_cast<int>(list_.size()); }
......
...@@ -238,6 +238,8 @@ Network::~Network() { ...@@ -238,6 +238,8 @@ Network::~Network() {
} }
} }
Network::ProxyOncConfig::ProxyOncConfig() : type(PROXY_ONC_DIRECT) {}
void Network::SetNetworkParser(NetworkParser* parser) { void Network::SetNetworkParser(NetworkParser* parser) {
network_parser_.reset(parser); network_parser_.reset(parser);
} }
...@@ -1319,6 +1321,18 @@ void WimaxNetwork::CalculateUniqueId() { ...@@ -1319,6 +1321,18 @@ void WimaxNetwork::CalculateUniqueId() {
set_unique_id(name() + "|" + eap_identity()); set_unique_id(name() + "|" + eap_identity());
} }
NetworkLibrary::EAPConfigData::EAPConfigData()
: method(EAP_METHOD_UNKNOWN),
auth(EAP_PHASE_2_AUTH_AUTO),
use_system_cas(true) {
}
NetworkLibrary::EAPConfigData::~EAPConfigData() {}
NetworkLibrary::VPNConfigData::VPNConfigData() {}
NetworkLibrary::VPNConfigData::~VPNConfigData() {}
// static // static
NetworkLibrary* NetworkLibrary::GetImpl(bool stub) { NetworkLibrary* NetworkLibrary::GetImpl(bool stub) {
NetworkLibrary* impl; NetworkLibrary* impl;
......
...@@ -314,7 +314,7 @@ class Network { ...@@ -314,7 +314,7 @@ class Network {
// Structure used only for parsing ONC's ProxySettings value. // Structure used only for parsing ONC's ProxySettings value.
struct ProxyOncConfig { struct ProxyOncConfig {
ProxyOncConfig() : type(PROXY_ONC_DIRECT) {} ProxyOncConfig();
ProxyOncType type; ProxyOncType type;
std::string pac_url; // Only for PROXY_TYPE_PAC. std::string pac_url; // Only for PROXY_TYPE_PAC.
...@@ -1586,11 +1586,8 @@ class NetworkLibrary { ...@@ -1586,11 +1586,8 @@ class NetworkLibrary {
// and optional EAP configuration. If |security| is SECURITY_8021X, // and optional EAP configuration. If |security| is SECURITY_8021X,
// |eap_config| must be provided. // |eap_config| must be provided.
struct EAPConfigData { struct EAPConfigData {
EAPConfigData() EAPConfigData();
: method(EAP_METHOD_UNKNOWN), ~EAPConfigData();
auth(EAP_PHASE_2_AUTH_AUTO),
use_system_cas(true) {}
~EAPConfigData() {}
EAPMethod method; EAPMethod method;
EAPPhase2Auth auth; EAPPhase2Auth auth;
std::string server_ca_cert_nss_nickname; std::string server_ca_cert_nss_nickname;
...@@ -1610,8 +1607,8 @@ class NetworkLibrary { ...@@ -1610,8 +1607,8 @@ class NetworkLibrary {
// Connect to the specified virtual network with service name. // Connect to the specified virtual network with service name.
// VPNConfigData must be provided. // VPNConfigData must be provided.
struct VPNConfigData { struct VPNConfigData {
VPNConfigData() {} VPNConfigData();
~VPNConfigData() {} ~VPNConfigData();
std::string psk; std::string psk;
std::string server_ca_cert_nss_nickname; std::string server_ca_cert_nss_nickname;
std::string client_cert_pkcs11_id; std::string client_cert_pkcs11_id;
......
...@@ -746,6 +746,25 @@ void NetworkLibraryImplBase::SetNetworkProfile( ...@@ -746,6 +746,25 @@ void NetworkLibraryImplBase::SetNetworkProfile(
NotifyNetworkManagerChanged(false); NotifyNetworkManagerChanged(false);
} }
NetworkLibraryImplBase::NetworkProfile::NetworkProfile(const std::string& p,
NetworkProfileType t)
: path(p),
type(t) {
}
NetworkLibraryImplBase::NetworkProfile::~NetworkProfile() {}
NetworkLibraryImplBase::ConnectData::ConnectData()
: security(SECURITY_NONE),
eap_method(EAP_METHOD_UNKNOWN),
eap_auth(EAP_PHASE_2_AUTH_AUTO),
eap_use_system_cas(false),
save_credentials(false),
profile_type(PROFILE_NONE) {
}
NetworkLibraryImplBase::ConnectData::~ConnectData() {}
const NetworkDevice* NetworkLibraryImplBase::FindDeviceByType( const NetworkDevice* NetworkLibraryImplBase::FindDeviceByType(
ConnectionType type) const { ConnectionType type) const {
for (NetworkDeviceMap::const_iterator iter = device_map_.begin(); for (NetworkDeviceMap::const_iterator iter = device_map_.begin();
......
...@@ -262,9 +262,8 @@ class NetworkLibraryImplBase : public NetworkLibrary { ...@@ -262,9 +262,8 @@ class NetworkLibraryImplBase : public NetworkLibrary {
std::set<std::string> > NetworkSourceMap; std::set<std::string> > NetworkSourceMap;
struct NetworkProfile { struct NetworkProfile {
NetworkProfile(const std::string& p, NetworkProfileType t) NetworkProfile(const std::string& p, NetworkProfileType t);
: path(p), type(t) {} ~NetworkProfile();
~NetworkProfile() {}
std::string path; std::string path;
NetworkProfileType type; NetworkProfileType type;
typedef std::set<std::string> ServiceList; typedef std::set<std::string> ServiceList;
...@@ -273,14 +272,8 @@ class NetworkLibraryImplBase : public NetworkLibrary { ...@@ -273,14 +272,8 @@ class NetworkLibraryImplBase : public NetworkLibrary {
typedef std::list<NetworkProfile> NetworkProfileList; typedef std::list<NetworkProfile> NetworkProfileList;
struct ConnectData { struct ConnectData {
ConnectData() : ConnectData();
security(SECURITY_NONE), ~ConnectData();
eap_method(EAP_METHOD_UNKNOWN),
eap_auth(EAP_PHASE_2_AUTH_AUTO),
eap_use_system_cas(false),
save_credentials(false),
profile_type(PROFILE_NONE) {}
~ConnectData() {}
ConnectionSecurity security; ConnectionSecurity security;
std::string service_name; // For example, SSID. std::string service_name; // For example, SSID.
std::string username; std::string username;
......
...@@ -768,6 +768,8 @@ FileBrowserEventRouter::FileWatcherExtensions::FileWatcherExtensions( ...@@ -768,6 +768,8 @@ FileBrowserEventRouter::FileWatcherExtensions::FileWatcherExtensions(
AddExtension(extension_id); AddExtension(extension_id);
} }
FileBrowserEventRouter::FileWatcherExtensions::~FileWatcherExtensions() {}
void FileBrowserEventRouter::FileWatcherExtensions::AddExtension( void FileBrowserEventRouter::FileWatcherExtensions::AddExtension(
const std::string& extension_id) { const std::string& extension_id) {
ExtensionUsageRegistry::iterator it = extensions_.find(extension_id); ExtensionUsageRegistry::iterator it = extensions_.find(extension_id);
......
...@@ -118,7 +118,7 @@ class FileBrowserEventRouter ...@@ -118,7 +118,7 @@ class FileBrowserEventRouter
const std::string& extension_id, const std::string& extension_id,
bool is_remote_file_system); bool is_remote_file_system);
~FileWatcherExtensions() {} ~FileWatcherExtensions();
void AddExtension(const std::string& extension_id); void AddExtension(const std::string& extension_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment