diff options
Diffstat (limited to 'chrome/browser/extensions/api/messaging')
8 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.h b/chrome/browser/extensions/api/messaging/extension_message_port.h index d0a6273..a10c031 100644 --- a/chrome/browser/extensions/api/messaging/extension_message_port.h +++ b/chrome/browser/extensions/api/messaging/extension_message_port.h @@ -28,14 +28,14 @@ class ExtensionMessagePort : public MessageService::MessagePort { const std::string& source_extension_id, const std::string& target_extension_id, const GURL& source_url, - const std::string& tls_channel_id) OVERRIDE; + const std::string& tls_channel_id) override; virtual void DispatchOnDisconnect(int source_port_id, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; virtual void DispatchOnMessage(const Message& message, - int target_port_id) OVERRIDE; - virtual void IncrementLazyKeepaliveCount() OVERRIDE; - virtual void DecrementLazyKeepaliveCount() OVERRIDE; - virtual content::RenderProcessHost* GetRenderProcessHost() OVERRIDE; + int target_port_id) override; + virtual void IncrementLazyKeepaliveCount() override; + virtual void DecrementLazyKeepaliveCount() override; + virtual content::RenderProcessHost* GetRenderProcessHost() override; private: content::RenderProcessHost* process_; diff --git a/chrome/browser/extensions/api/messaging/message_service.h b/chrome/browser/extensions/api/messaging/message_service.h index a8ca323..2fc5e80 100644 --- a/chrome/browser/extensions/api/messaging/message_service.h +++ b/chrome/browser/extensions/api/messaging/message_service.h @@ -147,7 +147,7 @@ class MessageService : public BrowserContextKeyedAPI, // Closes the message channel associated with the given port, and notifies // the other side. virtual void CloseChannel(int port_id, - const std::string& error_message) OVERRIDE; + const std::string& error_message) override; // Enqueues a message on a pending channel, or sends a message to the given // port if the channel isn't pending. @@ -156,7 +156,7 @@ class MessageService : public BrowserContextKeyedAPI, // NativeMessageProcessHost::Client virtual void PostMessageFromNativeProcess( int port_id, - const std::string& message) OVERRIDE; + const std::string& message) override; private: friend class MockMessageService; @@ -195,7 +195,7 @@ class MessageService : public BrowserContextKeyedAPI, // content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) OVERRIDE; + const content::NotificationDetails& details) override; // A process that might be in our list of channels has closed. void OnProcessClosed(content::RenderProcessHost* process); diff --git a/chrome/browser/extensions/api/messaging/native_message_port.h b/chrome/browser/extensions/api/messaging/native_message_port.h index f94db96..b3f7605 100644 --- a/chrome/browser/extensions/api/messaging/native_message_port.h +++ b/chrome/browser/extensions/api/messaging/native_message_port.h @@ -17,7 +17,7 @@ class NativeMessagePort : public MessageService::MessagePort { explicit NativeMessagePort(NativeMessageProcessHost* native_process); virtual ~NativeMessagePort(); virtual void DispatchOnMessage(const Message& message, - int target_port_id) OVERRIDE; + int target_port_id) override; private: NativeMessageProcessHost* native_process_; diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.h b/chrome/browser/extensions/api/messaging/native_message_process_host.h index 47fe872..fb19240 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.h +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.h @@ -86,8 +86,8 @@ class NativeMessageProcessHost #if defined(OS_POSIX) // MessageLoopForIO::Watcher interface - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; #endif // !defined(OS_POSIX) // Try and read a single message from |read_file_|. This should only be called diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index 32cf9ce..bb9c7a0 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -81,7 +81,7 @@ class FakeLauncher : public NativeProcessLauncher { virtual void Launch(const GURL& origin, const std::string& native_host_name, - LaunchedCallback callback) const OVERRIDE { + LaunchedCallback callback) const override { callback.Run(NativeProcessLauncher::RESULT_SUCCESS, base::kNullProcessHandle, read_file_.Pass(), write_file_.Pass()); @@ -101,11 +101,11 @@ class NativeMessagingTest : public ::testing::Test, thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), channel_closed_(false) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (native_message_process_host_.get()) { BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, native_message_process_host_.release()); @@ -115,7 +115,7 @@ class NativeMessagingTest : public ::testing::Test, virtual void PostMessageFromNativeProcess( int port_id, - const std::string& message) OVERRIDE { + const std::string& message) override { last_message_ = message; // Parse the message. @@ -134,7 +134,7 @@ class NativeMessagingTest : public ::testing::Test, } virtual void CloseChannel(int port_id, - const std::string& error_message) OVERRIDE { + const std::string& error_message) override { channel_closed_ = true; if (run_loop_) run_loop_->Quit(); diff --git a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc index 4e4e909..0cdf3ef 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc @@ -25,7 +25,7 @@ const char kTestOrigin[] = class NativeMessagingHostManifestTest : public ::testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); manifest_path_ = temp_dir_.path().AppendASCII("test.json"); } diff --git a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h index 6cd3a8e..fc099e4 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h +++ b/chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h @@ -28,9 +28,9 @@ class NativeMessagingHostListPolicyHandler // ConfigurationPolicyHandler methods: virtual bool CheckPolicySettings(const policy::PolicyMap& policies, - policy::PolicyErrorMap* errors) OVERRIDE; + policy::PolicyErrorMap* errors) override; virtual void ApplyPolicySettings(const policy::PolicyMap& policies, - PrefValueMap* prefs) OVERRIDE; + PrefValueMap* prefs) override; protected: const char* pref_path() const; diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc index 45cfd3c..8073b79 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc @@ -43,7 +43,7 @@ class NativeProcessLauncherImpl : public NativeProcessLauncher { virtual void Launch(const GURL& origin, const std::string& native_host_name, - LaunchedCallback callback) const OVERRIDE; + LaunchedCallback callback) const override; private: class Core : public base::RefCountedThreadSafe<Core> { |