summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 23:41:38 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 23:41:38 +0000
commitc2a6aa323905a384677df735ccaa68ac700b1587 (patch)
treebc32b52e7c9bd0fd68a5724f65d04f9d45fa8cf2 /chrome
parent90a792541bf27389f57427bf838350b3aaa03608 (diff)
downloadchromium_src-c2a6aa323905a384677df735ccaa68ac700b1587.zip
chromium_src-c2a6aa323905a384677df735ccaa68ac700b1587.tar.gz
chromium_src-c2a6aa323905a384677df735ccaa68ac700b1587.tar.bz2
Fix chromium-style compile error that got in the tree since yesterday.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6532008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_about_handler.cc4
-rw-r--r--chrome/browser/browser_about_handler.h3
-rw-r--r--chrome/browser/extensions/extension_special_storage_policy.cc8
-rw-r--r--chrome/browser/extensions/extension_special_storage_policy.h8
-rw-r--r--chrome/common/render_messages_params.cc12
-rw-r--r--chrome/common/render_messages_params.h6
-rw-r--r--chrome/test/webdriver/commands/cookie_commands.cc33
-rw-r--r--chrome/test/webdriver/commands/cookie_commands.h20
-rw-r--r--chrome/test/webdriver/cookie.cc2
-rw-r--r--chrome/test/webdriver/cookie.h1
10 files changed, 85 insertions, 12 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 535937f..e4ff802 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -86,6 +86,10 @@ AboutTcmallocOutputs* AboutTcmallocOutputs::GetInstance() {
return Singleton<AboutTcmallocOutputs>::get();
}
+AboutTcmallocOutputs::AboutTcmallocOutputs() {}
+
+AboutTcmallocOutputs::~AboutTcmallocOutputs() {}
+
// Glue between the callback task and the method in the singleton.
void AboutTcmallocRendererCallback(base::ProcessId pid, std::string output) {
AboutTcmallocOutputs::GetInstance()->RendererCallback(pid, output);
diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h
index e5e31c9f..90d140b 100644
--- a/chrome/browser/browser_about_handler.h
+++ b/chrome/browser/browser_about_handler.h
@@ -60,7 +60,8 @@ class AboutTcmallocOutputs {
}
private:
- AboutTcmallocOutputs() {}
+ AboutTcmallocOutputs();
+ ~AboutTcmallocOutputs();
AboutTcmallocOutputsType outputs_;
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index 1a840fc..0a405c7 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -8,6 +8,8 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/url_constants.h"
+ExtensionSpecialStoragePolicy::ExtensionSpecialStoragePolicy() {}
+
bool ExtensionSpecialStoragePolicy::IsStorageProtected(const GURL& origin) {
if (origin.SchemeIs(chrome::kExtensionScheme))
return true;
@@ -54,10 +56,16 @@ void ExtensionSpecialStoragePolicy::RevokeRightsForAllExtensions() {
unlimited_extensions_.Clear();
}
+ExtensionSpecialStoragePolicy::~ExtensionSpecialStoragePolicy() {}
+
//-----------------------------------------------------------------------------
// SpecialCollection helper class
//-----------------------------------------------------------------------------
+ExtensionSpecialStoragePolicy::SpecialCollection::SpecialCollection() {}
+
+ExtensionSpecialStoragePolicy::SpecialCollection::~SpecialCollection() {}
+
bool ExtensionSpecialStoragePolicy::SpecialCollection::Contains(
const GURL& origin) {
CachedResults::const_iterator found = cached_resuts_.find(origin);
diff --git a/chrome/browser/extensions/extension_special_storage_policy.h b/chrome/browser/extensions/extension_special_storage_policy.h
index 72ab89b..34c4267 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.h
+++ b/chrome/browser/extensions/extension_special_storage_policy.h
@@ -20,6 +20,8 @@ class Extension;
// to determine which origins have these rights.
class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
public:
+ ExtensionSpecialStoragePolicy();
+
// SpecialStoragePolicy methods used by storage subsystems and the browsing
// data remover. These methods are safe to call on any thread.
virtual bool IsStorageProtected(const GURL& origin);
@@ -31,8 +33,14 @@ class ExtensionSpecialStoragePolicy : public quota::SpecialStoragePolicy {
void RevokeRightsForAllExtensions();
private:
+ friend class base::RefCountedThreadSafe<SpecialStoragePolicy>;
+ virtual ~ExtensionSpecialStoragePolicy();
+
class SpecialCollection {
public:
+ SpecialCollection();
+ ~SpecialCollection();
+
bool Contains(const GURL& origin);
void Add(const Extension* extension);
void Remove(const Extension* extension);
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 40aa2aa..a4c3ae6 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -272,6 +272,18 @@ ViewHostMsg_DomMessage_Params::ViewHostMsg_DomMessage_Params()
ViewHostMsg_DomMessage_Params::~ViewHostMsg_DomMessage_Params() {
}
+ViewHostMsg_MalwareDOMDetails_Node::ViewHostMsg_MalwareDOMDetails_Node() {
+}
+
+ViewHostMsg_MalwareDOMDetails_Node::~ViewHostMsg_MalwareDOMDetails_Node() {
+}
+
+ViewHostMsg_MalwareDOMDetails_Params::ViewHostMsg_MalwareDOMDetails_Params() {
+}
+
+ViewHostMsg_MalwareDOMDetails_Params::~ViewHostMsg_MalwareDOMDetails_Params() {
+}
+
ViewMsg_ExtensionLoaded_Params::ViewMsg_ExtensionLoaded_Params() {
}
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index e0e7d6b..3f0f78c 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -920,6 +920,9 @@ struct ViewHostMsg_AccessibilityNotification_Params {
// A node is essentially a frame.
struct ViewHostMsg_MalwareDOMDetails_Node {
+ ViewHostMsg_MalwareDOMDetails_Node();
+ ~ViewHostMsg_MalwareDOMDetails_Node();
+
// URL of this resource. Can be empty.
GURL url;
@@ -937,6 +940,9 @@ struct ViewHostMsg_MalwareDOMDetails_Node {
// Parameters to describe interesting details from a rendered page that lead
// to a malware warning.
struct ViewHostMsg_MalwareDOMDetails_Params {
+ ViewHostMsg_MalwareDOMDetails_Params();
+ ~ViewHostMsg_MalwareDOMDetails_Params();
+
// All the nodes we extracted.
std::vector<ViewHostMsg_MalwareDOMDetails_Node> nodes;
};
diff --git a/chrome/test/webdriver/commands/cookie_commands.cc b/chrome/test/webdriver/commands/cookie_commands.cc
index 8021fa0..04b9637 100644
--- a/chrome/test/webdriver/commands/cookie_commands.cc
+++ b/chrome/test/webdriver/commands/cookie_commands.cc
@@ -17,6 +17,12 @@
namespace webdriver {
+CookieCommand::CookieCommand(const std::vector<std::string>& path_segments,
+ const DictionaryValue* const parameters)
+ : WebDriverCommand(path_segments, parameters) {}
+
+CookieCommand::~CookieCommand() {}
+
bool CookieCommand::Init(Response* const response) {
if (WebDriverCommand::Init(response)) {
if (session_->GetURL(&current_url_)) {
@@ -30,6 +36,18 @@ bool CookieCommand::Init(Response* const response) {
return false;
}
+bool CookieCommand::DoesDelete() {
+ return true;
+}
+
+bool CookieCommand::DoesGet() {
+ return true;
+}
+
+bool CookieCommand::DoesPost() {
+ return true;
+}
+
void CookieCommand::ExecuteGet(Response* const response) {
// TODO(JMikhail): Add GetJSONCookies to automation proxy since
// GetCookies does not return the necessary information
@@ -125,6 +143,13 @@ void CookieCommand::ExecuteDelete(Response* const response) {
response->set_status(kSuccess);
}
+NamedCookieCommand::NamedCookieCommand(
+ const std::vector<std::string>& path_segments,
+ const DictionaryValue* const parameters)
+ : WebDriverCommand(path_segments, parameters) {}
+
+NamedCookieCommand::~NamedCookieCommand() {}
+
bool NamedCookieCommand::Init(Response* const response) {
if (WebDriverCommand::Init(response)) {
if (!session_->GetURL(&current_url_)) {
@@ -148,6 +173,14 @@ bool NamedCookieCommand::Init(Response* const response) {
return false;
}
+bool NamedCookieCommand::DoesDelete() {
+ return true;
+}
+
+bool NamedCookieCommand::DoesGet() {
+ return true;
+}
+
void NamedCookieCommand::ExecuteGet(Response* const response) {
std::string cookie;
diff --git a/chrome/test/webdriver/commands/cookie_commands.h b/chrome/test/webdriver/commands/cookie_commands.h
index a040185..9a525447 100644
--- a/chrome/test/webdriver/commands/cookie_commands.h
+++ b/chrome/test/webdriver/commands/cookie_commands.h
@@ -25,15 +25,14 @@ class Response;
class CookieCommand : public WebDriverCommand {
public:
CookieCommand(const std::vector<std::string>& path_segments,
- const DictionaryValue* const parameters)
- : WebDriverCommand(path_segments, parameters) {}
- virtual ~CookieCommand() {}
+ const DictionaryValue* const parameters);
+ virtual ~CookieCommand();
virtual bool Init(Response* const response);
- virtual bool DoesDelete() { return true; }
- virtual bool DoesGet() { return true; }
- virtual bool DoesPost() { return true; }
+ virtual bool DoesDelete();
+ virtual bool DoesGet();
+ virtual bool DoesPost();
virtual void ExecuteDelete(Response* const response);
virtual void ExecuteGet(Response* const response);
@@ -51,15 +50,14 @@ class CookieCommand : public WebDriverCommand {
class NamedCookieCommand : public WebDriverCommand {
public:
NamedCookieCommand(const std::vector<std::string>& path_segments,
- const DictionaryValue* const parameters)
- : WebDriverCommand(path_segments, parameters) {}
- virtual ~NamedCookieCommand() {}
+ const DictionaryValue* const parameters);
+ virtual ~NamedCookieCommand();
virtual bool Init(Response* const response);
protected:
- virtual bool DoesDelete() { return true; }
- virtual bool DoesGet() { return true; }
+ virtual bool DoesDelete();
+ virtual bool DoesGet();
virtual void ExecuteDelete(Response* const response);
virtual void ExecuteGet(Response* const response);
diff --git a/chrome/test/webdriver/cookie.cc b/chrome/test/webdriver/cookie.cc
index 3d0bf02..5d55c0c 100644
--- a/chrome/test/webdriver/cookie.cc
+++ b/chrome/test/webdriver/cookie.cc
@@ -89,6 +89,8 @@ Cookie::Cookie(const DictionaryValue& dict) {
valid_ = true;
}
+Cookie::~Cookie() {}
+
// Convert's to webdriver's cookie spec, see:
// http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/cookie
DictionaryValue* Cookie::ToDictionary() {
diff --git a/chrome/test/webdriver/cookie.h b/chrome/test/webdriver/cookie.h
index 00f74f6..d8d1c0a 100644
--- a/chrome/test/webdriver/cookie.h
+++ b/chrome/test/webdriver/cookie.h
@@ -17,6 +17,7 @@ class Cookie {
public:
explicit Cookie(const std::string& cookie);
explicit Cookie(const DictionaryValue& dict);
+ ~Cookie();
DictionaryValue* ToDictionary();
// ToJSONString() returns a string form of a JSON object with the required