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

Side by Side Diff: ash/magnifier/partial_magnification_controller.h

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 unified diff | Download patch
« no previous file with comments | « ash/magnifier/magnification_controller_unittest.cc ('k') | ash/popup_message.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_ 5 #ifndef ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_
6 #define ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_ 6 #define ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_
7 7
8 #include "ui/aura/window_observer.h" 8 #include "ui/aura/window_observer.h"
9 #include "ui/events/event_handler.h" 9 #include "ui/events/event_handler.h"
10 #include "ui/gfx/point.h" 10 #include "ui/gfx/point.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 // Create the magnifier window. 56 // Create the magnifier window.
57 void CreateMagnifierWindow(); 57 void CreateMagnifierWindow();
58 58
59 // Cleans up the window if needed. 59 // Cleans up the window if needed.
60 void CloseMagnifierWindow(); 60 void CloseMagnifierWindow();
61 61
62 // Removes this as an observer of the zoom widget and the root window. 62 // Removes this as an observer of the zoom widget and the root window.
63 void RemoveZoomWidgetObservers(); 63 void RemoveZoomWidgetObservers();
64 64
65 // ui::EventHandler overrides: 65 // ui::EventHandler overrides:
66 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 66 virtual void OnMouseEvent(ui::MouseEvent* event) override;
67 67
68 // Overridden from WindowObserver: 68 // Overridden from WindowObserver:
69 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 69 virtual void OnWindowDestroying(aura::Window* window) override;
70 70
71 // Overridden from WidgetObserver: 71 // Overridden from WidgetObserver:
72 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 72 virtual void OnWidgetDestroying(views::Widget* widget) override;
73 73
74 // True if the magnified window is in motion of zooming or un-zooming effect. 74 // True if the magnified window is in motion of zooming or un-zooming effect.
75 // Otherwise, false. 75 // Otherwise, false.
76 bool is_on_zooming_; 76 bool is_on_zooming_;
77 77
78 bool is_enabled_; 78 bool is_enabled_;
79 79
80 // Current scale, origin (left-top) position of the magnification window. 80 // Current scale, origin (left-top) position of the magnification window.
81 float scale_; 81 float scale_;
82 gfx::Point origin_; 82 gfx::Point origin_;
83 83
84 views::Widget* zoom_widget_; 84 views::Widget* zoom_widget_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(PartialMagnificationController); 86 DISALLOW_COPY_AND_ASSIGN(PartialMagnificationController);
87 }; 87 };
88 88
89 } // namespace ash 89 } // namespace ash
90 90
91 #endif // ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_ 91 #endif // ASH_MAGNIFIER_PARTIAL_MAGNIFICATION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller_unittest.cc ('k') | ash/popup_message.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698