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

Side by Side Diff: ash/display/screen_ash.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/display/root_window_transformers_unittest.cc ('k') | ash/display/screen_ash.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_DISPLAY_SCREEN_ASH_H_ 5 #ifndef ASH_DISPLAY_SCREEN_ASH_H_
6 #define ASH_DISPLAY_SCREEN_ASH_H_ 6 #define ASH_DISPLAY_SCREEN_ASH_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // Returns a gfx::Display object for secondary display. Returns 55 // Returns a gfx::Display object for secondary display. Returns
56 // invalid display if there is no secondary display connected. 56 // invalid display if there is no secondary display connected.
57 static const gfx::Display& GetSecondaryDisplay(); 57 static const gfx::Display& GetSecondaryDisplay();
58 58
59 // Returns a gfx::Display object for the specified id. Returns 59 // Returns a gfx::Display object for the specified id. Returns
60 // invalid display if no such display is connected. 60 // invalid display if no such display is connected.
61 static const gfx::Display& GetDisplayForId(int64 display_id); 61 static const gfx::Display& GetDisplayForId(int64 display_id);
62 62
63 // gfx::Screen overrides: 63 // gfx::Screen overrides:
64 virtual bool IsDIPEnabled() OVERRIDE; 64 virtual bool IsDIPEnabled() override;
65 virtual gfx::Point GetCursorScreenPoint() OVERRIDE; 65 virtual gfx::Point GetCursorScreenPoint() override;
66 virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; 66 virtual gfx::NativeWindow GetWindowUnderCursor() override;
67 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) 67 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
68 OVERRIDE; 68 override;
69 virtual int GetNumDisplays() const OVERRIDE; 69 virtual int GetNumDisplays() const override;
70 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; 70 virtual std::vector<gfx::Display> GetAllDisplays() const override;
71 virtual gfx::Display GetDisplayNearestWindow( 71 virtual gfx::Display GetDisplayNearestWindow(
72 gfx::NativeView view) const OVERRIDE; 72 gfx::NativeView view) const override;
73 virtual gfx::Display GetDisplayNearestPoint( 73 virtual gfx::Display GetDisplayNearestPoint(
74 const gfx::Point& point) const OVERRIDE; 74 const gfx::Point& point) const override;
75 virtual gfx::Display GetDisplayMatching( 75 virtual gfx::Display GetDisplayMatching(
76 const gfx::Rect& match_rect) const OVERRIDE; 76 const gfx::Rect& match_rect) const override;
77 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; 77 virtual gfx::Display GetPrimaryDisplay() const override;
78 virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; 78 virtual void AddObserver(gfx::DisplayObserver* observer) override;
79 virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; 79 virtual void RemoveObserver(gfx::DisplayObserver* observer) override;
80 80
81 private: 81 private:
82 friend class DisplayManager; 82 friend class DisplayManager;
83 83
84 // Notifies observers of display configuration changes. 84 // Notifies observers of display configuration changes.
85 void NotifyMetricsChanged(const gfx::Display& display, uint32_t metrics); 85 void NotifyMetricsChanged(const gfx::Display& display, uint32_t metrics);
86 void NotifyDisplayAdded(const gfx::Display& display); 86 void NotifyDisplayAdded(const gfx::Display& display);
87 void NotifyDisplayRemoved(const gfx::Display& display); 87 void NotifyDisplayRemoved(const gfx::Display& display);
88 88
89 // Creates a screen that can be used during shutdown. 89 // Creates a screen that can be used during shutdown.
90 // It simply has a copy of the displays. 90 // It simply has a copy of the displays.
91 gfx::Screen* CloneForShutdown(); 91 gfx::Screen* CloneForShutdown();
92 92
93 ObserverList<gfx::DisplayObserver> observers_; 93 ObserverList<gfx::DisplayObserver> observers_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(ScreenAsh); 95 DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
96 }; 96 };
97 97
98 } // namespace ash 98 } // namespace ash
99 99
100 #endif // ASH_DISPLAY_SCREEN_ASH_H_ 100 #endif // ASH_DISPLAY_SCREEN_ASH_H_
OLDNEW
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698