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

Unified Diff: ash/host/ash_window_tree_host_win.cc

Issue 1088593006: Update {virtual,override} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ash/host/ash_remote_window_tree_host_win.h ('k') | ash/system/win/audio/tray_audio_delegate_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_win.cc
diff --git a/ash/host/ash_window_tree_host_win.cc b/ash/host/ash_window_tree_host_win.cc
index d8ab45bc15191d81aa82a51c4fe803d7c4a5aa8b..9d0988de3540f2e37a4b4df8171e78c99e097459 100644
--- a/ash/host/ash_window_tree_host_win.cc
+++ b/ash/host/ash_window_tree_host_win.cc
@@ -28,11 +28,11 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,
saved_window_style_(0),
saved_window_ex_style_(0),
transformer_helper_(this) {}
- virtual ~AshWindowTreeHostWin() {}
+ ~AshWindowTreeHostWin() override {}
private:
// AshWindowTreeHost:
- virtual void ToggleFullScreen() override {
+ void ToggleFullScreen() override {
gfx::Rect target_rect;
if (!fullscreen_) {
fullscreen_ = true;
@@ -66,19 +66,18 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,
target_rect.height(),
SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);
}
- virtual bool ConfineCursorToRootWindow() override { return false; }
- virtual void UnConfineCursor() override { NOTIMPLEMENTED(); }
- virtual void SetRootWindowTransformer(
- scoped_ptr<RootWindowTransformer> transformer) {
+ bool ConfineCursorToRootWindow() override { return false; }
+ void UnConfineCursor() override { NOTIMPLEMENTED(); }
+ void SetRootWindowTransformer(scoped_ptr<RootWindowTransformer> transformer) {
transformer_helper_.SetRootWindowTransformer(transformer.Pass());
}
- virtual gfx::Insets GetHostInsets() const override {
+ gfx::Insets GetHostInsets() const override {
return transformer_helper_.GetHostInsets();
}
- virtual aura::WindowTreeHost* AsWindowTreeHost() override { return this; }
+ aura::WindowTreeHost* AsWindowTreeHost() override { return this; }
// WindowTreeHostWin:
- virtual void SetBounds(const gfx::Rect& bounds) override {
+ void SetBounds(const gfx::Rect& bounds) override {
if (fullscreen_) {
saved_window_rect_.right = saved_window_rect_.left + bounds.width();
saved_window_rect_.bottom = saved_window_rect_.top + bounds.height();
@@ -86,16 +85,16 @@ class AshWindowTreeHostWin : public AshWindowTreeHost,
}
WindowTreeHostWin::SetBounds(bounds);
}
- virtual void SetRootTransform(const gfx::Transform& transform) override {
+ void SetRootTransform(const gfx::Transform& transform) override {
transformer_helper_.SetTransform(transform);
}
gfx::Transform GetRootTransform() const {
return transformer_helper_.GetTransform();
}
- virtual gfx::Transform GetInverseRootTransform() const override {
+ gfx::Transform GetInverseRootTransform() const override {
return transformer_helper_.GetInverseTransform();
}
- virtual void UpdateRootWindowSize(const gfx::Size& host_size) override {
+ void UpdateRootWindowSize(const gfx::Size& host_size) override {
transformer_helper_.UpdateWindowSize(host_size);
}
« no previous file with comments | « ash/host/ash_remote_window_tree_host_win.h ('k') | ash/system/win/audio/tray_audio_delegate_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698