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

Side by Side Diff: ui/gfx/screen_win.h

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/screen_mac.mm ('k') | ui/gfx/sys_color_change_listener.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 UI_GFX_SCREEN_WIN_H_ 5 #ifndef UI_GFX_SCREEN_WIN_H_
6 #define UI_GFX_SCREEN_WIN_H_ 6 #define UI_GFX_SCREEN_WIN_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/gfx/display_change_notifier.h" 9 #include "ui/gfx/display_change_notifier.h"
10 #include "ui/gfx/gfx_export.h" 10 #include "ui/gfx/gfx_export.h"
11 #include "ui/gfx/screen.h" 11 #include "ui/gfx/screen.h"
12 #include "ui/gfx/win/singleton_hwnd.h" 12 #include "ui/gfx/win/singleton_hwnd.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 15
16 class GFX_EXPORT ScreenWin : public Screen, 16 class GFX_EXPORT ScreenWin : public Screen,
17 public SingletonHwnd::Observer { 17 public SingletonHwnd::Observer {
18 public: 18 public:
19 ScreenWin(); 19 ScreenWin();
20 virtual ~ScreenWin(); 20 virtual ~ScreenWin();
21 21
22 protected: 22 protected:
23 // Overridden from gfx::Screen: 23 // Overridden from gfx::Screen:
24 virtual bool IsDIPEnabled() OVERRIDE; 24 virtual bool IsDIPEnabled() override;
25 virtual gfx::Point GetCursorScreenPoint() OVERRIDE; 25 virtual gfx::Point GetCursorScreenPoint() override;
26 virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; 26 virtual gfx::NativeWindow GetWindowUnderCursor() override;
27 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) 27 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
28 OVERRIDE; 28 override;
29 virtual int GetNumDisplays() const OVERRIDE; 29 virtual int GetNumDisplays() const override;
30 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; 30 virtual std::vector<gfx::Display> GetAllDisplays() const override;
31 virtual gfx::Display GetDisplayNearestWindow( 31 virtual gfx::Display GetDisplayNearestWindow(
32 gfx::NativeView window) const OVERRIDE; 32 gfx::NativeView window) const override;
33 virtual gfx::Display GetDisplayNearestPoint( 33 virtual gfx::Display GetDisplayNearestPoint(
34 const gfx::Point& point) const OVERRIDE; 34 const gfx::Point& point) const override;
35 virtual gfx::Display GetDisplayMatching( 35 virtual gfx::Display GetDisplayMatching(
36 const gfx::Rect& match_rect) const OVERRIDE; 36 const gfx::Rect& match_rect) const override;
37 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; 37 virtual gfx::Display GetPrimaryDisplay() const override;
38 virtual void AddObserver(DisplayObserver* observer) OVERRIDE; 38 virtual void AddObserver(DisplayObserver* observer) override;
39 virtual void RemoveObserver(DisplayObserver* observer) OVERRIDE; 39 virtual void RemoveObserver(DisplayObserver* observer) override;
40 40
41 // Overriden from gfx::SingletonHwnd::Observer. 41 // Overriden from gfx::SingletonHwnd::Observer.
42 virtual void OnWndProc(HWND hwnd, 42 virtual void OnWndProc(HWND hwnd,
43 UINT message, 43 UINT message,
44 WPARAM wparam, 44 WPARAM wparam,
45 LPARAM lparam) OVERRIDE; 45 LPARAM lparam) override;
46 46
47 // Returns the HWND associated with the NativeView. 47 // Returns the HWND associated with the NativeView.
48 virtual HWND GetHWNDFromNativeView(NativeView window) const; 48 virtual HWND GetHWNDFromNativeView(NativeView window) const;
49 49
50 // Returns the NativeView associated with the HWND. 50 // Returns the NativeView associated with the HWND.
51 virtual NativeWindow GetNativeWindowFromHWND(HWND hwnd) const; 51 virtual NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
52 52
53 private: 53 private:
54 // Helper implementing the DisplayObserver handling. 54 // Helper implementing the DisplayObserver handling.
55 gfx::DisplayChangeNotifier change_notifier_; 55 gfx::DisplayChangeNotifier change_notifier_;
56 56
57 // Current list of displays. 57 // Current list of displays.
58 std::vector<gfx::Display> displays_; 58 std::vector<gfx::Display> displays_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(ScreenWin); 60 DISALLOW_COPY_AND_ASSIGN(ScreenWin);
61 }; 61 };
62 62
63 } // namespace gfx 63 } // namespace gfx
64 64
65 #endif // UI_GFX_SCREEN_WIN_H_ 65 #endif // UI_GFX_SCREEN_WIN_H_
OLDNEW
« no previous file with comments | « ui/gfx/screen_mac.mm ('k') | ui/gfx/sys_color_change_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698