| Index: android_webview/native/aw_dev_tools_server.cc
|
| diff --git a/android_webview/native/aw_dev_tools_server.cc b/android_webview/native/aw_dev_tools_server.cc
|
| index 3ae81eefc597cf9ff59633de0b6e94569dcb7eb8..900458378676a5388a6556ac9ad211dfd678b4b3 100644
|
| --- a/android_webview/native/aw_dev_tools_server.cc
|
| +++ b/android_webview/native/aw_dev_tools_server.cc
|
| @@ -39,19 +39,19 @@ class AwDevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
|
| virtual ~AwDevToolsServerDelegate() {}
|
|
|
| // DevToolsHttpProtocolHandler::Delegate overrides.
|
| - virtual std::string GetDiscoveryPageHTML() OVERRIDE;
|
| + virtual std::string GetDiscoveryPageHTML() override;
|
|
|
| - virtual bool BundlesFrontendResources() OVERRIDE {
|
| + virtual bool BundlesFrontendResources() override {
|
| return false;
|
| }
|
|
|
| - 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>();
|
| }
|
|
|
| @@ -79,7 +79,7 @@ class UnixDomainServerSocketFactory
|
|
|
| private:
|
| // content::DevToolsHttpHandler::ServerSocketFactory.
|
| - virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
|
| + virtual scoped_ptr<net::ServerSocket> Create() const override {
|
| return scoped_ptr<net::ServerSocket>(
|
| new net::UnixDomainServerSocket(
|
| base::Bind(&content::CanUserConnectToDevTools),
|
|
|