summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 18:25:03 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 18:25:03 +0000
commit7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7 (patch)
tree423fdaae7c04f5ea304640618000675feb4e3443 /net/base
parent57005ec7bf8cebf0e53a3e59dd9ca062ba1eb053 (diff)
downloadchromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.zip
chromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.tar.gz
chromium_src-7cf4091e5e3eb7b3ee40c8fdc886226100b3a2e7.tar.bz2
Start deinlining non-empty virtual methods. (This will be automatically checked
for in the future.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5574006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/capturing_net_log.cc4
-rw-r--r--net/base/capturing_net_log.h2
-rw-r--r--net/base/cookie_monster.cc4
-rw-r--r--net/base/cookie_monster.h2
-rw-r--r--net/base/host_resolver.cc8
-rw-r--r--net/base/host_resolver.h6
6 files changed, 20 insertions, 6 deletions
diff --git a/net/base/capturing_net_log.cc b/net/base/capturing_net_log.cc
index e785990..fccd5ae 100644
--- a/net/base/capturing_net_log.cc
+++ b/net/base/capturing_net_log.cc
@@ -38,6 +38,10 @@ uint32 CapturingNetLog::NextID() {
return base::subtle::NoBarrier_AtomicIncrement(&last_id_, 1);
}
+NetLog::LogLevel CapturingNetLog::GetLogLevel() const {
+ return LOG_ALL_BUT_BYTES;
+}
+
void CapturingNetLog::GetEntries(EntryList* entry_list) const {
AutoLock lock(lock_);
*entry_list = entries_;
diff --git a/net/base/capturing_net_log.h b/net/base/capturing_net_log.h
index 3b6a39e..9254725 100644
--- a/net/base/capturing_net_log.h
+++ b/net/base/capturing_net_log.h
@@ -54,7 +54,7 @@ class CapturingNetLog : public NetLog {
EventPhase phase,
EventParameters* extra_parameters);
virtual uint32 NextID();
- virtual LogLevel GetLogLevel() const { return LOG_ALL_BUT_BYTES; }
+ virtual LogLevel GetLogLevel() const;
// Returns the list of all entries in the log.
void GetEntries(EntryList* entry_list) const;
diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
index 04de3ca..8eb3a49 100644
--- a/net/base/cookie_monster.cc
+++ b/net/base/cookie_monster.cc
@@ -1323,6 +1323,10 @@ void CookieMonster::DeleteCookie(const GURL& url,
}
}
+CookieMonster* CookieMonster::GetCookieMonster() {
+ return this;
+}
+
CookieList CookieMonster::GetAllCookies() {
AutoLock autolock(lock_);
InitIfNecessary();
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index 2e9614e..a985176 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -146,7 +146,7 @@ class CookieMonster : public CookieStore {
// Deletes all cookies with that might apply to |url| that has |cookie_name|.
virtual void DeleteCookie(const GURL& url, const std::string& cookie_name);
- virtual CookieMonster* GetCookieMonster() { return this; }
+ virtual CookieMonster* GetCookieMonster();
// Sets a cookie given explicit user-provided cookie attributes. The cookie
// name, value, domain, etc. are each provided as separate strings. This
diff --git a/net/base/host_resolver.cc b/net/base/host_resolver.cc
index fbd63bd..a8b642a 100644
--- a/net/base/host_resolver.cc
+++ b/net/base/host_resolver.cc
@@ -25,6 +25,14 @@ HostResolver::HostResolver() {
HostResolver::~HostResolver() {
}
+AddressFamily HostResolver::GetDefaultAddressFamily() const {
+ return net::ADDRESS_FAMILY_UNSPECIFIED;
+}
+
+HostResolverImpl* HostResolver::GetAsHostResolverImpl() {
+ return NULL;
+}
+
SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver)
: resolver_(resolver),
cur_request_(NULL),
diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 471ad8a..4fc5c89 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -170,14 +170,12 @@ class HostResolver {
// results to AF_INET by passing in ADDRESS_FAMILY_IPV4, or to
// AF_INET6 by passing in ADDRESS_FAMILY_IPV6.
virtual void SetDefaultAddressFamily(AddressFamily address_family) {}
- virtual AddressFamily GetDefaultAddressFamily() const {
- return net::ADDRESS_FAMILY_UNSPECIFIED;
- }
+ virtual AddressFamily GetDefaultAddressFamily() const;
// Returns |this| cast to a HostResolverImpl*, or NULL if the subclass
// is not compatible with HostResolverImpl. Used primarily to expose
// additional functionality on the about:net-internals page.
- virtual HostResolverImpl* GetAsHostResolverImpl() { return NULL; }
+ virtual HostResolverImpl* GetAsHostResolverImpl();
// Does additional cleanup prior to destruction.
virtual void Shutdown() {}