summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/geolocation/wifi_data_provider_corewlan_mac.mm2
-rw-r--r--content/browser/geolocation/wifi_data_provider_mac.cc2
-rw-r--r--content/browser/mach_broker_mac.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm2
-rw-r--r--content/common/sandbox_mac_fontloading_unittest.mm4
-rw-r--r--content/common/sandbox_mac_system_access_unittest.mm8
-rw-r--r--content/renderer/external_popup_menu_browsertest.cc2
7 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
index 3d22dd4..f552984 100644
--- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
+++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
@@ -55,7 +55,7 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
bool Init();
// WlanApiInterface
- virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
+ virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE;
private:
scoped_nsobject<NSBundle> bundle_;
diff --git a/content/browser/geolocation/wifi_data_provider_mac.cc b/content/browser/geolocation/wifi_data_provider_mac.cc
index 561a309..c72950e 100644
--- a/content/browser/geolocation/wifi_data_provider_mac.cc
+++ b/content/browser/geolocation/wifi_data_provider_mac.cc
@@ -37,7 +37,7 @@ class Apple80211Api : public WifiDataProviderCommon::WlanApiInterface {
bool Init();
// WlanApiInterface
- virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
+ virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE;
private:
// Handle, context and function pointers for Apple80211 library.
diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc
index 5662449..466c84d 100644
--- a/content/browser/mach_broker_mac.cc
+++ b/content/browser/mach_broker_mac.cc
@@ -43,7 +43,7 @@ class MachListenerThreadDelegate : public base::PlatformThread::Delegate {
}
// Implement |PlatformThread::Delegate|.
- void ThreadMain() {
+ virtual void ThreadMain() OVERRIDE {
base::MachReceiveMessage message;
kern_return_t err;
while ((err = receive_port_->WaitForMessage(&message,
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
index a66af96..c81681a 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
@@ -82,7 +82,7 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl {
edit_command_message_count_(0) {
}
- virtual bool Send(IPC::Message* message) {
+ virtual bool Send(IPC::Message* message) OVERRIDE {
if (message->type() == ViewMsg_ExecuteEditCommand::ID)
edit_command_message_count_++;
return RenderWidgetHostImpl::Send(message);
diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm
index 30ac477..1c16683 100644
--- a/content/common/sandbox_mac_fontloading_unittest.mm
+++ b/content/common/sandbox_mac_fontloading_unittest.mm
@@ -19,8 +19,8 @@ namespace content {
class FontLoadingTestCase : public MacSandboxTestCase {
public:
FontLoadingTestCase() : font_data_length_(-1) {}
- virtual bool BeforeSandboxInit();
- virtual bool SandboxedTest();
+ virtual bool BeforeSandboxInit() OVERRIDE;
+ virtual bool SandboxedTest() OVERRIDE;
private:
scoped_ptr<base::SharedMemory> font_shmem_;
size_t font_data_length_;
diff --git a/content/common/sandbox_mac_system_access_unittest.mm b/content/common/sandbox_mac_system_access_unittest.mm
index c216786..6eb681a 100644
--- a/content/common/sandbox_mac_system_access_unittest.mm
+++ b/content/common/sandbox_mac_system_access_unittest.mm
@@ -20,9 +20,9 @@ class MacSandboxedClipboardTestCase : public MacSandboxTestCase {
MacSandboxedClipboardTestCase();
virtual ~MacSandboxedClipboardTestCase();
- virtual bool SandboxedTest();
+ virtual bool SandboxedTest() OVERRIDE;
- virtual void SetTestData(const char* test_data);
+ virtual void SetTestData(const char* test_data) OVERRIDE;
private:
NSString* clipboard_name_;
};
@@ -79,7 +79,7 @@ TEST_F(MacSandboxTest, ClipboardAccess) {
// Test case for checking sandboxing of filesystem apis.
class MacSandboxedFileAccessTestCase : public MacSandboxTestCase {
public:
- virtual bool SandboxedTest();
+ virtual bool SandboxedTest() OVERRIDE;
};
REGISTER_SANDBOX_TEST_CASE(MacSandboxedFileAccessTestCase);
@@ -98,7 +98,7 @@ TEST_F(MacSandboxTest, FileAccess) {
// /dev/urandom is available to ppapi sandbox only.
class MacSandboxedUrandomTestCase : public MacSandboxTestCase {
public:
- virtual bool SandboxedTest();
+ virtual bool SandboxedTest() OVERRIDE;
};
REGISTER_SANDBOX_TEST_CASE(MacSandboxedUrandomTestCase);
diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc
index c271e09..56810d9 100644
--- a/content/renderer/external_popup_menu_browsertest.cc
+++ b/content/renderer/external_popup_menu_browsertest.cc
@@ -128,7 +128,7 @@ class ExternalPopupMenuRemoveTest : public ExternalPopupMenuTest {
ExternalPopupMenuRemoveTest() {}
protected:
- virtual bool ShouldRemoveSelectOnChange() const { return true; }
+ virtual bool ShouldRemoveSelectOnChange() const OVERRIDE { return true; }
};
// Tests that nothing bad happen when the page removes the select when it