| Index: ui/wm/core/shadow_unittest.cc
|
| diff --git a/ui/wm/core/shadow_unittest.cc b/ui/wm/core/shadow_unittest.cc
|
| index 2ffdd4a4a3225ff8f43fca969b38aa007f3eb0bb..10f44951b7c8e677f0b579db13cf08ccb015ed36 100644
|
| --- a/ui/wm/core/shadow_unittest.cc
|
| +++ b/ui/wm/core/shadow_unittest.cc
|
| @@ -35,20 +35,18 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
|
| image_small_ = gfx::Image::CreateFrom1xBitmap(bitmap_small);
|
| image_large_ = gfx::Image::CreateFrom1xBitmap(bitmap_large);
|
| }
|
| - virtual ~MockResourceBundleDelegate() {}
|
| + ~MockResourceBundleDelegate() override {}
|
|
|
| // ResourceBundle::Delegate:
|
| - virtual base::FilePath GetPathForResourcePack(
|
| - const base::FilePath& pack_path,
|
| - ui::ScaleFactor scale_factor) override {
|
| + base::FilePath GetPathForResourcePack(const base::FilePath& pack_path,
|
| + ui::ScaleFactor scale_factor) override {
|
| return base::FilePath();
|
| }
|
| - virtual base::FilePath GetPathForLocalePack(
|
| - const base::FilePath& pack_path,
|
| - const std::string& locale) override {
|
| + base::FilePath GetPathForLocalePack(const base::FilePath& pack_path,
|
| + const std::string& locale) override {
|
| return base::FilePath();
|
| }
|
| - virtual gfx::Image GetImageNamed(int resource_id) override {
|
| + gfx::Image GetImageNamed(int resource_id) override {
|
| last_resource_id_ = resource_id;
|
| switch (resource_id) {
|
| case IDR_WINDOW_BUBBLE_SHADOW_SMALL:
|
| @@ -61,25 +59,24 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
|
| return gfx::Image();
|
| }
|
| }
|
| - virtual gfx::Image GetNativeImageNamed(
|
| - int resource_id, ui::ResourceBundle::ImageRTL rtl) override {
|
| + gfx::Image GetNativeImageNamed(int resource_id,
|
| + ui::ResourceBundle::ImageRTL rtl) override {
|
| return gfx::Image();
|
| }
|
| - virtual base::RefCountedStaticMemory* LoadDataResourceBytes(
|
| - int resource_id, ui::ScaleFactor scale_factor) override {
|
| + base::RefCountedStaticMemory* LoadDataResourceBytes(
|
| + int resource_id,
|
| + ui::ScaleFactor scale_factor) override {
|
| return NULL;
|
| }
|
| - virtual bool GetRawDataResource(
|
| - int resource_id, ui::ScaleFactor scale_factor,
|
| - base::StringPiece* value) override {
|
| + bool GetRawDataResource(int resource_id,
|
| + ui::ScaleFactor scale_factor,
|
| + base::StringPiece* value) override {
|
| return false;
|
| }
|
| - virtual bool GetLocalizedString(
|
| - int message_id, base::string16* value) override {
|
| + bool GetLocalizedString(int message_id, base::string16* value) override {
|
| return false;
|
| }
|
| - virtual scoped_ptr<gfx::Font> GetFont(
|
| - ui::ResourceBundle::FontStyle style) override {
|
| + scoped_ptr<gfx::Font> GetFont(ui::ResourceBundle::FontStyle style) override {
|
| return scoped_ptr<gfx::Font>();
|
| }
|
|
|
| @@ -98,12 +95,12 @@ class MockResourceBundleDelegate : public ui::ResourceBundle::Delegate {
|
| class ShadowTest: public aura::test::AuraTestBase {
|
| public:
|
| ShadowTest() {}
|
| - virtual ~ShadowTest() {}
|
| + ~ShadowTest() override {}
|
|
|
| MockResourceBundleDelegate* delegate() { return delegate_.get(); }
|
|
|
| // aura::testAuraBase:
|
| - virtual void SetUp() override {
|
| + void SetUp() override {
|
| aura::test::AuraTestBase::SetUp();
|
| delegate_.reset(new MockResourceBundleDelegate());
|
| if (ResourceBundle::HasSharedInstance())
|
| @@ -111,7 +108,7 @@ class ShadowTest: public aura::test::AuraTestBase {
|
| ui::ResourceBundle::InitSharedInstanceWithLocale(
|
| "en-US", delegate(), ui::ResourceBundle::LOAD_COMMON_RESOURCES);
|
| }
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| ui::ResourceBundle::CleanupSharedInstance();
|
| base::FilePath ui_test_pak_path;
|
| ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
|
|
|