Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: ui/gfx/image/image_ios_unittest.mm

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/image/image_family_unittest.cc ('k') | ui/gfx/image/image_skia_operations.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <QuartzCore/QuartzCore.h> 5 #import <QuartzCore/QuartzCore.h>
6 #import <UIKit/UIKit.h> 6 #import <UIKit/UIKit.h>
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/mac/scoped_cftyperef.h" 9 #include "base/mac/scoped_cftyperef.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 30 matching lines...) Expand all
41 scale:scale 41 scale:scale
42 orientation:UIImageOrientationUp]; 42 orientation:UIImageOrientationUp];
43 } 43 }
44 44
45 45
46 class ImageIOSTest : public testing::Test { 46 class ImageIOSTest : public testing::Test {
47 public: 47 public:
48 ImageIOSTest() {} 48 ImageIOSTest() {}
49 virtual ~ImageIOSTest() {} 49 virtual ~ImageIOSTest() {}
50 50
51 virtual void SetUp() OVERRIDE { 51 virtual void SetUp() override {
52 original_scale_factors_ = gfx::ImageSkia::GetSupportedScales(); 52 original_scale_factors_ = gfx::ImageSkia::GetSupportedScales();
53 } 53 }
54 54
55 virtual void TearDown() OVERRIDE { 55 virtual void TearDown() override {
56 gfx::ImageSkia::SetSupportedScales(original_scale_factors_); 56 gfx::ImageSkia::SetSupportedScales(original_scale_factors_);
57 } 57 }
58 58
59 private: 59 private:
60 // Used to save and restore the scale factors in effect before this test. 60 // Used to save and restore the scale factors in effect before this test.
61 std::vector<float> original_scale_factors_; 61 std::vector<float> original_scale_factors_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(ImageIOSTest); 63 DISALLOW_COPY_AND_ASSIGN(ImageIOSTest);
64 }; 64 };
65 65
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 EXPECT_EQ(kWidth, imageskia->width()); 100 EXPECT_EQ(kWidth, imageskia->width());
101 EXPECT_EQ(kHeight, imageskia->height()); 101 EXPECT_EQ(kHeight, imageskia->height());
102 102
103 // TODO(rohitrao): Convert from ImageSkia back to UIImage. This should 103 // TODO(rohitrao): Convert from ImageSkia back to UIImage. This should
104 // scale the image based on the current set of supported scales. 104 // scale the image based on the current set of supported scales.
105 } 105 }
106 } 106 }
107 } 107 }
108 108
109 } // namespace 109 } // namespace
OLDNEW
« no previous file with comments | « ui/gfx/image/image_family_unittest.cc ('k') | ui/gfx/image/image_skia_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698