summaryrefslogtreecommitdiffstats
path: root/extensions/shell/app
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:32:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:32:37 +0000
commit0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch)
treeb8777ad781ca887318c7760bb7380fd662497558 /extensions/shell/app
parentc0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff)
downloadchromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463 Review URL: https://codereview.chromium.org/622343002 Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/shell/app')
-rw-r--r--extensions/shell/app/shell_main_delegate.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h
index f29ac42..7e5aea9 100644
--- a/extensions/shell/app/shell_main_delegate.h
+++ b/extensions/shell/app/shell_main_delegate.h
@@ -25,14 +25,14 @@ class ShellMainDelegate : public content::ContentMainDelegate {
virtual ~ShellMainDelegate();
// ContentMainDelegate implementation:
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
- virtual void PreSandboxStartup() OVERRIDE;
- virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
+ virtual void PreSandboxStartup() override;
+ virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
virtual content::ContentRendererClient* CreateContentRendererClient()
- OVERRIDE;
+ override;
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
virtual void ZygoteStarting(
- ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE;
+ ScopedVector<content::ZygoteForkDelegate>* delegates) override;
#endif
protected: