summaryrefslogtreecommitdiffstats
path: root/components/nacl/browser
diff options
context:
space:
mode:
Diffstat (limited to 'components/nacl/browser')
-rw-r--r--components/nacl/browser/nacl_broker_host_win.cc2
-rw-r--r--components/nacl/browser/nacl_file_host_unittest.cc6
-rw-r--r--components/nacl/browser/nacl_host_message_filter.h4
-rw-r--r--components/nacl/browser/nacl_process_host.cc4
-rw-r--r--components/nacl/browser/nacl_process_host.h8
-rw-r--r--components/nacl/browser/test_nacl_browser_delegate.h26
6 files changed, 25 insertions, 25 deletions
diff --git a/components/nacl/browser/nacl_broker_host_win.cc b/components/nacl/browser/nacl_broker_host_win.cc
index f42cb7f..b6839ad 100644
--- a/components/nacl/browser/nacl_broker_host_win.cc
+++ b/components/nacl/browser/nacl_broker_host_win.cc
@@ -28,7 +28,7 @@ class NaClBrokerSandboxedProcessLauncherDelegate
NaClBrokerSandboxedProcessLauncherDelegate() {}
virtual ~NaClBrokerSandboxedProcessLauncherDelegate() {}
- virtual bool ShouldSandbox() OVERRIDE {
+ virtual bool ShouldSandbox() override {
return false;
}
diff --git a/components/nacl/browser/nacl_file_host_unittest.cc b/components/nacl/browser/nacl_file_host_unittest.cc
index 0a83b7f..c3da2de 100644
--- a/components/nacl/browser/nacl_file_host_unittest.cc
+++ b/components/nacl/browser/nacl_file_host_unittest.cc
@@ -19,7 +19,7 @@ class FileHostTestNaClBrowserDelegate : public TestNaClBrowserDelegate {
public:
FileHostTestNaClBrowserDelegate() {}
- virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) OVERRIDE {
+ virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override {
*pnacl_dir = pnacl_path_;
return true;
}
@@ -37,12 +37,12 @@ class NaClFileHostTest : public testing::Test {
NaClFileHostTest();
virtual ~NaClFileHostTest();
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
nacl_browser_delegate_ = new FileHostTestNaClBrowserDelegate;
nacl::NaClBrowser::SetDelegate(nacl_browser_delegate_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// This deletes nacl_browser_delegate_.
nacl::NaClBrowser::SetDelegate(NULL);
}
diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h
index 341cc64..93ea0d4 100644
--- a/components/nacl/browser/nacl_host_message_filter.h
+++ b/components/nacl/browser/nacl_host_message_filter.h
@@ -35,8 +35,8 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
net::URLRequestContextGetter* request_context);
// content::BrowserMessageFilter methods:
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void OnChannelClosing() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
+ virtual void OnChannelClosing() override;
int render_process_id() { return render_process_id_; }
bool off_the_record() { return off_the_record_; }
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 9b7dcdb8..3b6ddcf 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -176,10 +176,10 @@ class NaClSandboxedProcessLauncherDelegate
}
}
#elif defined(OS_POSIX)
- virtual bool ShouldUseZygote() OVERRIDE {
+ virtual bool ShouldUseZygote() override {
return true;
}
- virtual int GetIpcFd() OVERRIDE {
+ virtual int GetIpcFd() override {
return ipc_fd_;
}
#endif // OS_WIN
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 54d3e60..1bb5288 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -69,7 +69,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
const base::FilePath& profile_directory);
virtual ~NaClProcessHost();
- virtual void OnProcessCrashed(int exit_status) OVERRIDE;
+ virtual void OnProcessCrashed(int exit_status) override;
// Do any minimal work that must be done at browser startup.
static void EarlyStartup();
@@ -83,7 +83,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
IPC::Message* reply_msg,
const base::FilePath& manifest_path);
- virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+ virtual void OnChannelConnected(int32 peer_pid) override;
#if defined(OS_WIN)
void OnProcessLaunchedByBroker(base::ProcessHandle handle);
@@ -117,8 +117,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
bool LaunchSelLdr();
// BrowserChildProcessHostDelegate implementation:
- virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
- virtual void OnProcessLaunched() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& msg) override;
+ virtual void OnProcessLaunched() override;
void OnResourcesReady();
diff --git a/components/nacl/browser/test_nacl_browser_delegate.h b/components/nacl/browser/test_nacl_browser_delegate.h
index 3e8e8ce..9aa5784 100644
--- a/components/nacl/browser/test_nacl_browser_delegate.h
+++ b/components/nacl/browser/test_nacl_browser_delegate.h
@@ -23,25 +23,25 @@ class TestNaClBrowserDelegate : public NaClBrowserDelegate {
TestNaClBrowserDelegate();
virtual ~TestNaClBrowserDelegate();
virtual void ShowMissingArchInfobar(int render_process_id,
- int render_view_id) OVERRIDE;
- virtual bool DialogsAreSuppressed() OVERRIDE;
- virtual bool GetCacheDirectory(base::FilePath* cache_dir) OVERRIDE;
- virtual bool GetPluginDirectory(base::FilePath* plugin_dir) OVERRIDE;
- virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) OVERRIDE;
- virtual bool GetUserDirectory(base::FilePath* user_dir) OVERRIDE;
- virtual std::string GetVersionString() const OVERRIDE;
+ int render_view_id) override;
+ virtual bool DialogsAreSuppressed() override;
+ virtual bool GetCacheDirectory(base::FilePath* cache_dir) override;
+ virtual bool GetPluginDirectory(base::FilePath* plugin_dir) override;
+ virtual bool GetPnaclDirectory(base::FilePath* pnacl_dir) override;
+ virtual bool GetUserDirectory(base::FilePath* user_dir) override;
+ virtual std::string GetVersionString() const override;
virtual ppapi::host::HostFactory* CreatePpapiHostFactory(
- content::BrowserPpapiHost* ppapi_host) OVERRIDE;
+ content::BrowserPpapiHost* ppapi_host) override;
virtual bool MapUrlToLocalFilePath(const GURL& url,
bool use_blocking_api,
const base::FilePath& profile_directory,
- base::FilePath* file_path) OVERRIDE;
- virtual void SetDebugPatterns(std::string debug_patterns) OVERRIDE;
- virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) OVERRIDE;
+ base::FilePath* file_path) override;
+ virtual void SetDebugPatterns(std::string debug_patterns) override;
+ virtual bool URLMatchesDebugPatterns(const GURL& manifest_url) override;
virtual content::BrowserPpapiHost::OnKeepaliveCallback
- GetOnKeepaliveCallback() OVERRIDE;
+ GetOnKeepaliveCallback() override;
virtual bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
- const GURL& manifest_url) OVERRIDE;
+ const GURL& manifest_url) override;
private:
DISALLOW_COPY_AND_ASSIGN(TestNaClBrowserDelegate);
generated by cgit v1.1 at 2024-10-31 08:29:56 +0000