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

Unified Diff: ash/display/root_window_transformers.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: ash/display/root_window_transformers.cc
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc
index cba66883ac78b0a30493acc486fca56871d6e21b..de380468243ec153158c10b04cff816947cdd822 100644
--- a/ash/display/root_window_transformers.cc
+++ b/ash/display/root_window_transformers.cc
@@ -142,14 +142,14 @@ class AshRootWindowTransformer : public RootWindowTransformer {
}
// aura::RootWindowTransformer overrides:
- virtual gfx::Transform GetTransform() const OVERRIDE {
+ virtual gfx::Transform GetTransform() const override {
return transform_;
}
- virtual gfx::Transform GetInverseTransform() const OVERRIDE {
+ virtual gfx::Transform GetInverseTransform() const override {
return invert_transform_;
}
virtual gfx::Rect GetRootWindowBounds(
- const gfx::Size& host_size) const OVERRIDE {
+ const gfx::Size& host_size) const override {
gfx::Rect bounds(host_size);
bounds.Inset(host_insets_);
bounds = ui::ConvertRectToDIP(root_window_->layer(), bounds);
@@ -168,7 +168,7 @@ class AshRootWindowTransformer : public RootWindowTransformer {
return gfx::Rect(gfx::ToFlooredSize(new_bounds.size()));
}
- virtual gfx::Insets GetHostInsets() const OVERRIDE {
+ virtual gfx::Insets GetHostInsets() const override {
return host_insets_;
}
@@ -238,19 +238,19 @@ class MirrorRootWindowTransformer : public RootWindowTransformer {
}
// aura::RootWindowTransformer overrides:
- virtual gfx::Transform GetTransform() const OVERRIDE {
+ virtual gfx::Transform GetTransform() const override {
return transform_;
}
- virtual gfx::Transform GetInverseTransform() const OVERRIDE {
+ virtual gfx::Transform GetInverseTransform() const override {
gfx::Transform invert;
CHECK(transform_.GetInverse(&invert));
return invert;
}
virtual gfx::Rect GetRootWindowBounds(
- const gfx::Size& host_size) const OVERRIDE {
+ const gfx::Size& host_size) const override {
return root_bounds_;
}
- virtual gfx::Insets GetHostInsets() const OVERRIDE {
+ virtual gfx::Insets GetHostInsets() const override {
return insets_;
}
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/display/root_window_transformers_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698