summaryrefslogtreecommitdiffstats
path: root/chrome/browser/themes/theme_syncable_service_unittest.cc
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-07 02:15:42 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 09:16:00 +0000
commitfb66cb4f9b6e380fa4b52301dee993b0b7b3b994 (patch)
tree10600bac38557fc0b1dfa36e282ac40afd2606cc /chrome/browser/themes/theme_syncable_service_unittest.cc
parent175d645623f98024fd94572f6229de455b30048a (diff)
downloadchromium_src-fb66cb4f9b6e380fa4b52301dee993b0b7b3b994.zip
chromium_src-fb66cb4f9b6e380fa4b52301dee993b0b7b3b994.tar.gz
chromium_src-fb66cb4f9b6e380fa4b52301dee993b0b7b3b994.tar.bz2
replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]*
BUG=417463 Review URL: https://codereview.chromium.org/629603002 Cr-Commit-Position: refs/heads/master@{#298430}
Diffstat (limited to 'chrome/browser/themes/theme_syncable_service_unittest.cc')
-rw-r--r--chrome/browser/themes/theme_syncable_service_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index 2130027..b7aa764 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -61,36 +61,36 @@ class FakeThemeService : public ThemeService {
is_dirty_(false) {}
// ThemeService implementation
- virtual void SetTheme(const extensions::Extension* extension) OVERRIDE {
+ virtual void SetTheme(const extensions::Extension* extension) override {
is_dirty_ = true;
theme_extension_ = extension;
using_system_theme_ = false;
using_default_theme_ = false;
}
- virtual void UseDefaultTheme() OVERRIDE {
+ virtual void UseDefaultTheme() override {
is_dirty_ = true;
using_default_theme_ = true;
using_system_theme_ = false;
theme_extension_ = NULL;
}
- virtual void UseSystemTheme() OVERRIDE {
+ virtual void UseSystemTheme() override {
is_dirty_ = true;
using_system_theme_ = true;
using_default_theme_ = false;
theme_extension_ = NULL;
}
- virtual bool UsingDefaultTheme() const OVERRIDE {
+ virtual bool UsingDefaultTheme() const override {
return using_default_theme_;
}
- virtual bool UsingSystemTheme() const OVERRIDE {
+ virtual bool UsingSystemTheme() const override {
return using_system_theme_;
}
- virtual string GetThemeID() const OVERRIDE {
+ virtual string GetThemeID() const override {
if (theme_extension_.get())
return theme_extension_->id();
else
@@ -236,7 +236,7 @@ class ThemeSyncableServiceTest : public testing::Test {
};
class PolicyInstalledThemeTest : public ThemeSyncableServiceTest {
- virtual extensions::Manifest::Location GetThemeLocation() OVERRIDE {
+ virtual extensions::Manifest::Location GetThemeLocation() override {
return extensions::Manifest::EXTERNAL_POLICY_DOWNLOAD;
}
};