diff options
author | mostynb <mostynb@opera.com> | 2014-10-09 05:49:44 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 12:50:07 +0000 |
commit | efdb7662cfef2020322e1e2bdbb0646020b4ff89 (patch) | |
tree | 336111f7598d25b77e507c6dd41f76dfd65757f4 /gin | |
parent | cb03e2e2687edcd5f43269d513c62fba5751a926 (diff) | |
download | chromium_src-efdb7662cfef2020322e1e2bdbb0646020b4ff89.zip chromium_src-efdb7662cfef2020322e1e2bdbb0646020b4ff89.tar.gz chromium_src-efdb7662cfef2020322e1e2bdbb0646020b4ff89.tar.bz2 |
change more OVERRIDE instances to override in gin/
BUG=417463
Review URL: https://codereview.chromium.org/639833004
Cr-Commit-Position: refs/heads/master@{#298856}
Diffstat (limited to 'gin')
-rw-r--r-- | gin/modules/module_registry_unittest.cc | 2 | ||||
-rw-r--r-- | gin/modules/module_runner_delegate.h | 6 | ||||
-rw-r--r-- | gin/modules/timer.h | 4 | ||||
-rw-r--r-- | gin/modules/timer_unittest.cc | 2 | ||||
-rw-r--r-- | gin/public/v8_platform.h | 6 | ||||
-rw-r--r-- | gin/shell/gin_main.cc | 2 | ||||
-rw-r--r-- | gin/test/file_runner.h | 2 | ||||
-rw-r--r-- | gin/test/v8_test.h | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/gin/modules/module_registry_unittest.cc b/gin/modules/module_registry_unittest.cc index 77bf9f1..57bc02d 100644 --- a/gin/modules/module_registry_unittest.cc +++ b/gin/modules/module_registry_unittest.cc @@ -37,7 +37,7 @@ class ModuleRegistryObserverImpl : public ModuleRegistryObserver { virtual void OnDidAddPendingModule( const std::string& id, - const std::vector<std::string>& dependencies) OVERRIDE { + const std::vector<std::string>& dependencies) override { did_add_count_++; id_ = id; dependencies_ = dependencies; diff --git a/gin/modules/module_runner_delegate.h b/gin/modules/module_runner_delegate.h index df91f63..421e23a 100644 --- a/gin/modules/module_runner_delegate.h +++ b/gin/modules/module_runner_delegate.h @@ -41,9 +41,9 @@ class GIN_EXPORT ModuleRunnerDelegate : public ShellRunnerDelegate { // From ShellRunnerDelegate: virtual v8::Handle<v8::ObjectTemplate> GetGlobalTemplate( ShellRunner* runner, - v8::Isolate* isolate) OVERRIDE; - virtual void DidCreateContext(ShellRunner* runner) OVERRIDE; - virtual void DidRunScript(ShellRunner* runner) OVERRIDE; + v8::Isolate* isolate) override; + virtual void DidCreateContext(ShellRunner* runner) override; + virtual void DidRunScript(ShellRunner* runner) override; BuiltinModuleMap builtin_modules_; FileModuleProvider module_provider_; diff --git a/gin/modules/timer.h b/gin/modules/timer.h index 1ec0b93..6284668 100644 --- a/gin/modules/timer.h +++ b/gin/modules/timer.h @@ -30,7 +30,7 @@ class GIN_EXPORT Timer : public Wrappable<Timer> { int delay_ms, v8::Handle<v8::Function> function); virtual ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; private: Timer(v8::Isolate* isolate, bool repeating, int delay_ms, @@ -58,7 +58,7 @@ class GIN_EXPORT TimerModule : public Wrappable<TimerModule> { virtual ~TimerModule(); virtual ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE; + v8::Isolate* isolate) override; }; } // namespace gin diff --git a/gin/modules/timer_unittest.cc b/gin/modules/timer_unittest.cc index f7fd8f2..42d7050 100644 --- a/gin/modules/timer_unittest.cc +++ b/gin/modules/timer_unittest.cc @@ -41,7 +41,7 @@ class Result : public Wrappable<Result> { } virtual ObjectTemplateBuilder GetObjectTemplateBuilder( - v8::Isolate* isolate) OVERRIDE { + v8::Isolate* isolate) override { return Wrappable<Result>::GetObjectTemplateBuilder(isolate) .SetProperty("count", &Result::count, &Result::set_count) .SetMethod("quit", &Result::Quit); diff --git a/gin/public/v8_platform.h b/gin/public/v8_platform.h index f085b58..59e2147 100644 --- a/gin/public/v8_platform.h +++ b/gin/public/v8_platform.h @@ -21,10 +21,10 @@ class GIN_EXPORT V8Platform : public NON_EXPORTED_BASE(v8::Platform) { // v8::Platform implementation. virtual void CallOnBackgroundThread( v8::Task* task, - v8::Platform::ExpectedRuntime expected_runtime) OVERRIDE; + v8::Platform::ExpectedRuntime expected_runtime) override; virtual void CallOnForegroundThread(v8::Isolate* isolate, - v8::Task* task) OVERRIDE; - virtual double MonotonicallyIncreasingTime() OVERRIDE; + v8::Task* task) override; + virtual double MonotonicallyIncreasingTime() override; private: friend struct base::DefaultLazyInstanceTraits<V8Platform>; diff --git a/gin/shell/gin_main.cc b/gin/shell/gin_main.cc index aa9f2b5..77b167a 100644 --- a/gin/shell/gin_main.cc +++ b/gin/shell/gin_main.cc @@ -45,7 +45,7 @@ class GinShellRunnerDelegate : public ModuleRunnerDelegate { } virtual void UnhandledException(ShellRunner* runner, - TryCatch& try_catch) OVERRIDE { + TryCatch& try_catch) override { ModuleRunnerDelegate::UnhandledException(runner, try_catch); LOG(ERROR) << try_catch.GetStackTrace(); } diff --git a/gin/test/file_runner.h b/gin/test/file_runner.h index f248fb5..5082cd5 100644 --- a/gin/test/file_runner.h +++ b/gin/test/file_runner.h @@ -25,7 +25,7 @@ class FileRunnerDelegate : public ModuleRunnerDelegate { private: // From ModuleRunnerDelegate: virtual void UnhandledException(ShellRunner* runner, - TryCatch& try_catch) OVERRIDE; + TryCatch& try_catch) override; DISALLOW_COPY_AND_ASSIGN(FileRunnerDelegate); }; diff --git a/gin/test/v8_test.h b/gin/test/v8_test.h index e62aa57..39ed4e9 100644 --- a/gin/test/v8_test.h +++ b/gin/test/v8_test.h @@ -22,8 +22,8 @@ class V8Test : public testing::Test { V8Test(); virtual ~V8Test(); - virtual void SetUp() OVERRIDE; - virtual void TearDown() OVERRIDE; + virtual void SetUp() override; + virtual void TearDown() override; protected: scoped_ptr<IsolateHolder> instance_; |