Skip to content

Commit

Permalink
Replacing the OVERRIDE with override and FINAL with final in content/…
Browse files Browse the repository at this point in the history
…browser/[devtools/ssl]

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

Review URL: https://codereview.chromium.org/634483005

Cr-Commit-Position: refs/heads/master@{#298387}
  • Loading branch information
mohan-486 authored and Commit bot committed Oct 7, 2014
1 parent 5efc538 commit d23d9ad
Show file tree
Hide file tree
Showing 19 changed files with 136 additions and 136 deletions.
18 changes: 9 additions & 9 deletions content/browser/devtools/devtools_agent_host_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
void Inspect(BrowserContext* browser_context);

// DevToolsAgentHost implementation.
virtual void AttachClient(DevToolsAgentHostClient* client) OVERRIDE;
virtual void DetachClient() OVERRIDE;
virtual bool IsAttached() OVERRIDE;
virtual void InspectElement(int x, int y) OVERRIDE;
virtual std::string GetId() OVERRIDE;
virtual WebContents* GetWebContents() OVERRIDE;
virtual void DisconnectWebContents() OVERRIDE;
virtual void ConnectWebContents(WebContents* wc) OVERRIDE;
virtual bool IsWorker() const OVERRIDE;
virtual void AttachClient(DevToolsAgentHostClient* client) override;
virtual void DetachClient() override;
virtual bool IsAttached() override;
virtual void InspectElement(int x, int y) override;
virtual std::string GetId() override;
virtual WebContents* GetWebContents() override;
virtual void DisconnectWebContents() override;
virtual void ConnectWebContents(WebContents* wc) override;
virtual bool IsWorker() const override;

protected:
DevToolsAgentHostImpl();
Expand Down
2 changes: 1 addition & 1 deletion content/browser/devtools/devtools_frontend_host_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class DevToolsFrontendHostImpl : public DevToolsFrontendHost,

private:
// WebContentsObserver overrides.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) override;

void OnDispatchOnInspectorBackend(const std::string& message);
void OnDispatchOnEmbedder(const std::string& message);
Expand Down
4 changes: 2 additions & 2 deletions content/browser/devtools/devtools_http_handler_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class DevToolsAgentHostClientImpl : public DevToolsAgentHostClient {

virtual void AgentHostClosed(
DevToolsAgentHost* agent_host,
bool replaced_with_another_client) OVERRIDE {
bool replaced_with_another_client) override {
DCHECK(agent_host == agent_host_.get());
agent_host_ = NULL;

Expand All @@ -121,7 +121,7 @@ class DevToolsAgentHostClientImpl : public DevToolsAgentHostClient {
}

virtual void DispatchProtocolMessage(
DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
DevToolsAgentHost* agent_host, const std::string& message) override {
DCHECK(agent_host == agent_host_.get());
message_loop_->PostTask(
FROM_HERE,
Expand Down
14 changes: 7 additions & 7 deletions content/browser/devtools/devtools_http_handler_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ class DevToolsHttpHandlerImpl
void Start();

// DevToolsHttpHandler implementation.
virtual void Stop() OVERRIDE;
virtual GURL GetFrontendURL() OVERRIDE;
virtual void Stop() override;
virtual GURL GetFrontendURL() override;

// net::HttpServer::Delegate implementation.
virtual void OnConnect(int connection_id) OVERRIDE {}
virtual void OnConnect(int connection_id) override {}
virtual void OnHttpRequest(int connection_id,
const net::HttpServerRequestInfo& info) OVERRIDE;
const net::HttpServerRequestInfo& info) override;
virtual void OnWebSocketRequest(
int connection_id,
const net::HttpServerRequestInfo& info) OVERRIDE;
const net::HttpServerRequestInfo& info) override;
virtual void OnWebSocketMessage(int connection_id,
const std::string& data) OVERRIDE;
virtual void OnClose(int connection_id) OVERRIDE;
const std::string& data) override;
virtual void OnClose(int connection_id) override;

void OnJsonRequestUI(int connection_id,
const net::HttpServerRequestInfo& info);
Expand Down
18 changes: 9 additions & 9 deletions content/browser/devtools/devtools_http_handler_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@ class DummyServerSocket : public net::ServerSocket {
DummyServerSocket() {}

// net::ServerSocket "implementation"
virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
virtual int Listen(const net::IPEndPoint& address, int backlog) override {
return net::OK;
}

virtual int ListenWithAddressAndPort(const std::string& ip_address,
int port,
int backlog) OVERRIDE {
int backlog) override {
return net::OK;
}

virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
virtual int GetLocalAddress(net::IPEndPoint* address) const override {
net::IPAddressNumber number;
EXPECT_TRUE(net::ParseIPLiteralToNumber("127.0.0.1", &number));
*address = net::IPEndPoint(number, kDummyPort);
return net::OK;
}

virtual int Accept(scoped_ptr<net::StreamSocket>* socket,
const net::CompletionCallback& callback) OVERRIDE {
const net::CompletionCallback& callback) override {
return net::ERR_IO_PENDING;
}
};
Expand All @@ -66,7 +66,7 @@ class DummyServerSocketFactory
}

private:
virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
virtual scoped_ptr<net::ServerSocket> Create() const override {
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, quit_closure_1_);
return scoped_ptr<net::ServerSocket>(new DummyServerSocket());
Expand All @@ -78,17 +78,17 @@ class DummyServerSocketFactory

class DummyDelegate : public DevToolsHttpHandlerDelegate {
public:
virtual std::string GetDiscoveryPageHTML() OVERRIDE { return std::string(); }
virtual std::string GetDiscoveryPageHTML() override { return std::string(); }

virtual bool BundlesFrontendResources() OVERRIDE { return true; }
virtual bool BundlesFrontendResources() override { return true; }

virtual base::FilePath GetDebugFrontendDir() OVERRIDE {
virtual base::FilePath GetDebugFrontendDir() override {
return base::FilePath();
}

virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
net::StreamListenSocket::Delegate* delegate,
std::string* name) OVERRIDE {
std::string* name) override {
return scoped_ptr<net::StreamListenSocket>();
}
};
Expand Down
56 changes: 28 additions & 28 deletions content/browser/devtools/devtools_manager_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ class TestDevToolsClientHost : public DevToolsAgentHostClient {
}

virtual void AgentHostClosed(
DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
DevToolsAgentHost* agent_host, bool replaced) override {
FAIL();
}

virtual void DispatchProtocolMessage(
DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
DevToolsAgentHost* agent_host, const std::string& message) override {
last_sent_message = &message;
}

Expand Down Expand Up @@ -87,7 +87,7 @@ class TestWebContentsDelegate : public WebContentsDelegate {
TestWebContentsDelegate() : renderer_unresponsive_received_(false) {}

// Notification that the contents is hung.
virtual void RendererUnresponsive(WebContents* source) OVERRIDE {
virtual void RendererUnresponsive(WebContents* source) override {
renderer_unresponsive_received_ = true;
}

Expand All @@ -105,24 +105,24 @@ class TestTarget : public DevToolsTarget {
: agent_host_(agent_host) {}
virtual ~TestTarget() {}

virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
virtual std::string GetParentId() const OVERRIDE { return std::string(); }
virtual std::string GetType() const OVERRIDE { return std::string(); }
virtual std::string GetTitle() const OVERRIDE {
virtual std::string GetId() const override { return agent_host_->GetId(); }
virtual std::string GetParentId() const override { return std::string(); }
virtual std::string GetType() const override { return std::string(); }
virtual std::string GetTitle() const override {
return agent_host_->GetTitle();
}
virtual std::string GetDescription() const OVERRIDE { return std::string(); }
virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
virtual GURL GetFaviconURL() const OVERRIDE { return GURL(); }
virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
virtual std::string GetDescription() const override { return std::string(); }
virtual GURL GetURL() const override { return agent_host_->GetURL(); }
virtual GURL GetFaviconURL() const override { return GURL(); }
virtual base::TimeTicks GetLastActivityTime() const override {
return base::TimeTicks();
}
virtual bool IsAttached() const OVERRIDE { return agent_host_->IsAttached(); }
virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
virtual bool IsAttached() const override { return agent_host_->IsAttached(); }
virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
return agent_host_;
}
virtual bool Activate() const OVERRIDE { return agent_host_->Activate(); }
virtual bool Close() const OVERRIDE { return agent_host_->Close(); }
virtual bool Activate() const override { return agent_host_->Activate(); }
virtual bool Close() const override { return agent_host_->Close(); }

private:
scoped_refptr<DevToolsAgentHost> agent_host_;
Expand All @@ -133,20 +133,20 @@ class TestDevToolsManagerDelegate : public DevToolsManagerDelegate {
virtual ~TestDevToolsManagerDelegate() {}

virtual void Inspect(BrowserContext* browser_context,
DevToolsAgentHost* agent_host) OVERRIDE {}
DevToolsAgentHost* agent_host) override {}

virtual void DevToolsAgentStateChanged(DevToolsAgentHost* agent_host,
bool attached) OVERRIDE {}
bool attached) override {}

virtual base::DictionaryValue* HandleCommand(
DevToolsAgentHost* agent_host,
base::DictionaryValue* command) OVERRIDE { return NULL; }
base::DictionaryValue* command) override { return NULL; }

virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) OVERRIDE {
virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) override {
return scoped_ptr<DevToolsTarget>();
}

virtual void EnumerateTargets(TargetCallback callback) OVERRIDE {
virtual void EnumerateTargets(TargetCallback callback) override {
TargetList result;
DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
for (DevToolsAgentHost::List::iterator it = agents.begin();
Expand All @@ -159,7 +159,7 @@ class TestDevToolsManagerDelegate : public DevToolsManagerDelegate {
callback.Run(result);
}

virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE {
virtual std::string GetPageThumbnailData(const GURL& url) override {
return std::string();
}
};
Expand All @@ -168,7 +168,7 @@ class ContentBrowserClientWithDevTools : public TestContentBrowserClient {
public:
virtual ~ContentBrowserClientWithDevTools() {}
virtual content::DevToolsManagerDelegate*
GetDevToolsManagerDelegate() OVERRIDE {
GetDevToolsManagerDelegate() override {
return new TestDevToolsManagerDelegate();
}
};
Expand All @@ -184,7 +184,7 @@ class TestDevToolsManagerObserver : public DevToolsManager::Observer {
return hosts_;
}

virtual void TargetListChanged(const TargetList& targets) OVERRIDE {
virtual void TargetListChanged(const TargetList& targets) override {
updates_count_++;
hosts_.clear();
for (TargetList::const_iterator it = targets.begin();
Expand All @@ -206,13 +206,13 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
: old_browser_client_(NULL) {}

protected:
virtual void SetUp() OVERRIDE {
virtual void SetUp() override {
RenderViewHostImplTestHarness::SetUp();
TestDevToolsClientHost::ResetCounters();
old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
}

virtual void TearDown() OVERRIDE {
virtual void TearDown() override {
SetBrowserClientForTesting(old_browser_client_);
RenderViewHostImplTestHarness::TearDown();
}
Expand Down Expand Up @@ -319,15 +319,15 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
EXPECT_EQ(count, event_counter_[name]);
}

virtual void Attach(DevToolsExternalAgentProxy* proxy) OVERRIDE {
virtual void Attach(DevToolsExternalAgentProxy* proxy) override {
recordEvent("Attach");
};

virtual void Detach() OVERRIDE {
virtual void Detach() override {
recordEvent("Detach");
};

virtual void SendMessageToBackend(const std::string& message) OVERRIDE {
virtual void SendMessageToBackend(const std::string& message) override {
recordEvent(std::string("SendMessageToBackend.") + message);
};

Expand Down
2 changes: 1 addition & 1 deletion content/browser/devtools/devtools_netlog_observer.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {

public:
// net::NetLog::ThreadSafeObserver implementation:
virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
virtual void OnAddEntry(const net::NetLog::Entry& entry) override;

void OnAddURLRequestEntry(const net::NetLog::Entry& entry);

Expand Down
2 changes: 1 addition & 1 deletion content/browser/devtools/devtools_power_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class DevToolsPowerHandler
virtual ~DevToolsPowerHandler();

// PowerProfilerObserver override.
virtual void OnPowerEvent(const PowerEventVector&) OVERRIDE;
virtual void OnPowerEvent(const PowerEventVector&) override;

void OnClientDetached();

Expand Down
4 changes: 2 additions & 2 deletions content/browser/devtools/devtools_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class DevToolsProtocol {
public:
int id() { return id_; }

virtual std::string Serialize() OVERRIDE;
virtual std::string Serialize() override;

// Creates success response. Takes ownership of |result|.
scoped_refptr<Response> SuccessResponse(base::DictionaryValue* result);
Expand Down Expand Up @@ -110,7 +110,7 @@ class DevToolsProtocol {
class Notification : public Message {
public:

virtual std::string Serialize() OVERRIDE;
virtual std::string Serialize() override;

private:
friend class DevToolsProtocol;
Expand Down
22 changes: 11 additions & 11 deletions content/browser/devtools/devtools_system_info_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,47 +34,47 @@ class AuxGPUInfoEnumerator : public gpu::GPUInfo::Enumerator {
: dictionary_(dictionary),
in_aux_attributes_(false) { }

virtual void AddInt64(const char* name, int64 value) OVERRIDE {
virtual void AddInt64(const char* name, int64 value) override {
if (in_aux_attributes_)
dictionary_->SetDouble(name, value);
}

virtual void AddInt(const char* name, int value) OVERRIDE {
virtual void AddInt(const char* name, int value) override {
if (in_aux_attributes_)
dictionary_->SetInteger(name, value);
}

virtual void AddString(const char* name, const std::string& value) OVERRIDE {
virtual void AddString(const char* name, const std::string& value) override {
if (in_aux_attributes_)
dictionary_->SetString(name, value);
}

virtual void AddBool(const char* name, bool value) OVERRIDE {
virtual void AddBool(const char* name, bool value) override {
if (in_aux_attributes_)
dictionary_->SetBoolean(name, value);
}

virtual void AddTimeDeltaInSecondsF(const char* name,
const base::TimeDelta& value) OVERRIDE {
const base::TimeDelta& value) override {
if (in_aux_attributes_)
dictionary_->SetDouble(name, value.InSecondsF());
}

virtual void BeginGPUDevice() OVERRIDE {
virtual void BeginGPUDevice() override {
}

virtual void EndGPUDevice() OVERRIDE {
virtual void EndGPUDevice() override {
}

virtual void BeginVideoEncodeAcceleratorSupportedProfile() OVERRIDE {}
virtual void BeginVideoEncodeAcceleratorSupportedProfile() override {}

virtual void EndVideoEncodeAcceleratorSupportedProfile() OVERRIDE {}
virtual void EndVideoEncodeAcceleratorSupportedProfile() override {}

virtual void BeginAuxAttributes() OVERRIDE {
virtual void BeginAuxAttributes() override {
in_aux_attributes_ = true;
}

virtual void EndAuxAttributes() OVERRIDE {
virtual void EndAuxAttributes() override {
in_aux_attributes_ = false;
}

Expand Down
4 changes: 2 additions & 2 deletions content/browser/devtools/devtools_tracing_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ class DevToolsTraceSinkProxy : public TracingController::TraceDataSink {
explicit DevToolsTraceSinkProxy(base::WeakPtr<DevToolsTracingHandler> handler)
: tracing_handler_(handler) {}

virtual void AddTraceChunk(const std::string& chunk) OVERRIDE {
virtual void AddTraceChunk(const std::string& chunk) override {
if (DevToolsTracingHandler* h = tracing_handler_.get())
h->OnTraceDataCollected(chunk);
}
virtual void Close() OVERRIDE {
virtual void Close() override {
if (DevToolsTracingHandler* h = tracing_handler_.get())
h->OnTraceComplete();
}
Expand Down
Loading

0 comments on commit d23d9ad

Please sign in to comment.