Commit dacbf2c3 authored by avi@chromium.org's avatar avi@chromium.org

Add OVERRIDE to chrome/common/ and nacl/.

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8551009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110941 0039d316-1c4b-4281-b951-d872f2087c98
parent 49fd7e22
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h" #include "base/gtest_prod_util.h"
class GURL; class GURL;
...@@ -199,23 +200,23 @@ class ContentSettingsPattern { ...@@ -199,23 +200,23 @@ class ContentSettingsPattern {
virtual ~Builder(); virtual ~Builder();
// Overrides BuilderInterface // Overrides BuilderInterface
virtual BuilderInterface* WithPort(const std::string& port); virtual BuilderInterface* WithPort(const std::string& port) OVERRIDE;
virtual BuilderInterface* WithPortWildcard(); virtual BuilderInterface* WithPortWildcard() OVERRIDE;
virtual BuilderInterface* WithHost(const std::string& host); virtual BuilderInterface* WithHost(const std::string& host) OVERRIDE;
virtual BuilderInterface* WithDomainWildcard(); virtual BuilderInterface* WithDomainWildcard() OVERRIDE;
virtual BuilderInterface* WithScheme(const std::string& scheme); virtual BuilderInterface* WithScheme(const std::string& scheme) OVERRIDE;
virtual BuilderInterface* WithSchemeWildcard(); virtual BuilderInterface* WithSchemeWildcard() OVERRIDE;
virtual BuilderInterface* WithPath(const std::string& path); virtual BuilderInterface* WithPath(const std::string& path) OVERRIDE;
virtual BuilderInterface* Invalid(); virtual BuilderInterface* Invalid() OVERRIDE;
virtual ContentSettingsPattern Build(); virtual ContentSettingsPattern Build() OVERRIDE;
private: private:
// Canonicalizes the pattern parts so that they are ASCII only, either // Canonicalizes the pattern parts so that they are ASCII only, either
// in original (if it was already ASCII) or punycode form. // in original (if it was already ASCII) or punycode form.
......
...@@ -30,21 +30,21 @@ class ExtensionLocalizationPeer ...@@ -30,21 +30,21 @@ class ExtensionLocalizationPeer
const GURL& request_url); const GURL& request_url);
// ResourceLoaderBridge::Peer methods. // ResourceLoaderBridge::Peer methods.
virtual void OnUploadProgress(uint64 position, uint64 size); virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
virtual bool OnReceivedRedirect( virtual bool OnReceivedRedirect(
const GURL& new_url, const GURL& new_url,
const webkit_glue::ResourceResponseInfo& info, const webkit_glue::ResourceResponseInfo& info,
bool* has_new_first_party_for_cookies, bool* has_new_first_party_for_cookies,
GURL* new_first_party_for_cookies); GURL* new_first_party_for_cookies) OVERRIDE;
virtual void OnReceivedResponse( virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info); const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnDownloadedData(int len) {} virtual void OnDownloadedData(int len) OVERRIDE {}
virtual void OnReceivedData(const char* data, virtual void OnReceivedData(const char* data,
int data_length, int data_length,
int encoded_data_length); int encoded_data_length) OVERRIDE;
virtual void OnCompletedRequest(const net::URLRequestStatus& status, virtual void OnCompletedRequest(const net::URLRequestStatus& status,
const std::string& security_info, const std::string& security_info,
const base::Time& completion_time); const base::Time& completion_time) OVERRIDE;
private: private:
friend class ExtensionLocalizationPeerTest; friend class ExtensionLocalizationPeerTest;
......
...@@ -35,24 +35,25 @@ class JsonPrefStore : public PersistentPrefStore, ...@@ -35,24 +35,25 @@ class JsonPrefStore : public PersistentPrefStore,
// PrefStore overrides: // PrefStore overrides:
virtual ReadResult GetValue(const std::string& key, virtual ReadResult GetValue(const std::string& key,
const base::Value** result) const; const base::Value** result) const OVERRIDE;
virtual void AddObserver(PrefStore::Observer* observer); virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
virtual void RemoveObserver(PrefStore::Observer* observer); virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
virtual bool IsInitializationComplete() const; virtual bool IsInitializationComplete() const OVERRIDE;
// PersistentPrefStore overrides: // PersistentPrefStore overrides:
virtual ReadResult GetMutableValue(const std::string& key, virtual ReadResult GetMutableValue(const std::string& key,
base::Value** result); base::Value** result) OVERRIDE;
virtual void SetValue(const std::string& key, base::Value* value); virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;
virtual void SetValueSilently(const std::string& key, base::Value* value); virtual void SetValueSilently(const std::string& key,
virtual void RemoveValue(const std::string& key); base::Value* value) OVERRIDE;
virtual bool ReadOnly() const; virtual void RemoveValue(const std::string& key) OVERRIDE;
virtual PrefReadError ReadPrefs(); virtual bool ReadOnly() const OVERRIDE;
virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate); virtual PrefReadError ReadPrefs() OVERRIDE;
virtual bool WritePrefs(); virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
virtual void ScheduleWritePrefs(); virtual bool WritePrefs() OVERRIDE;
virtual void CommitPendingWrite(); virtual void ScheduleWritePrefs() OVERRIDE;
virtual void ReportValueChanged(const std::string& key); virtual void CommitPendingWrite() OVERRIDE;
virtual void ReportValueChanged(const std::string& key) OVERRIDE;
// This method is called after JSON file has been read. Method takes // This method is called after JSON file has been read. Method takes
// ownership of the |value| pointer. Note, this method is used with // ownership of the |value| pointer. Note, this method is used with
...@@ -62,7 +63,7 @@ class JsonPrefStore : public PersistentPrefStore, ...@@ -62,7 +63,7 @@ class JsonPrefStore : public PersistentPrefStore,
private: private:
// ImportantFileWriter::DataSerializer overrides: // ImportantFileWriter::DataSerializer overrides:
virtual bool SerializeData(std::string* output); virtual bool SerializeData(std::string* output) OVERRIDE;
FilePath path_; FilePath path_;
scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_; scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_;
......
...@@ -236,10 +236,10 @@ class MetricsServiceBase : public HistogramSender { ...@@ -236,10 +236,10 @@ class MetricsServiceBase : public HistogramSender {
// HistogramSender interface (override) methods. // HistogramSender interface (override) methods.
virtual void TransmitHistogramDelta( virtual void TransmitHistogramDelta(
const base::Histogram& histogram, const base::Histogram& histogram,
const base::Histogram::SampleSet& snapshot); const base::Histogram::SampleSet& snapshot) OVERRIDE;
virtual void InconsistencyDetected(int problem); virtual void InconsistencyDetected(int problem) OVERRIDE;
virtual void UniqueInconsistencyDetected(int problem); virtual void UniqueInconsistencyDetected(int problem) OVERRIDE;
virtual void SnapshotProblemResolved(int amount); virtual void SnapshotProblemResolved(int amount) OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(MetricsServiceBase); DISALLOW_COPY_AND_ASSIGN(MetricsServiceBase);
}; };
......
...@@ -82,7 +82,7 @@ class GaiaAuthFetcher : public content::URLFetcherDelegate { ...@@ -82,7 +82,7 @@ class GaiaAuthFetcher : public content::URLFetcherDelegate {
void StartMergeSession(const std::string& auth_token); void StartMergeSession(const std::string& auth_token);
// Implementation of content::URLFetcherDelegate // Implementation of content::URLFetcherDelegate
virtual void OnURLFetchComplete(const content::URLFetcher* source); virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
// StartClientLogin been called && results not back yet? // StartClientLogin been called && results not back yet?
bool HasPendingFetch(); bool HasPendingFetch();
......
...@@ -35,7 +35,7 @@ class MockFetcher : public TestURLFetcher { ...@@ -35,7 +35,7 @@ class MockFetcher : public TestURLFetcher {
virtual ~MockFetcher(); virtual ~MockFetcher();
virtual void Start(); virtual void Start() OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(MockFetcher); DISALLOW_COPY_AND_ASSIGN(MockFetcher);
......
...@@ -47,8 +47,8 @@ class ServiceProcessTerminateMonitor ...@@ -47,8 +47,8 @@ class ServiceProcessTerminateMonitor
virtual ~ServiceProcessTerminateMonitor(); virtual ~ServiceProcessTerminateMonitor();
// MessageLoopForIO::Watcher overrides // MessageLoopForIO::Watcher overrides
virtual void OnFileCanReadWithoutBlocking(int fd); virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
virtual void OnFileCanWriteWithoutBlocking(int fd); virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
private: private:
base::Closure terminate_task_; base::Closure terminate_task_;
......
...@@ -23,7 +23,7 @@ class NaClListener : public IPC::Channel::Listener { ...@@ -23,7 +23,7 @@ class NaClListener : public IPC::Channel::Listener {
private: private:
void OnStartSelLdr(std::vector<nacl::FileDescriptor> handles); void OnStartSelLdr(std::vector<nacl::FileDescriptor> handles);
virtual bool OnMessageReceived(const IPC::Message& msg); virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
bool debug_enabled_; bool debug_enabled_;
......
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