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

Side by Side Diff: ash/display/display_change_observer_chromeos.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/cursor_window_controller.cc ('k') | ash/display/display_configurator_animation.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H 5 #ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H 6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 19 matching lines...) Expand all
30 30
31 // Returns the resolution list. 31 // Returns the resolution list.
32 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList( 32 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList(
33 const ui::DisplayConfigurator::DisplayState& output); 33 const ui::DisplayConfigurator::DisplayState& output);
34 34
35 DisplayChangeObserver(); 35 DisplayChangeObserver();
36 virtual ~DisplayChangeObserver(); 36 virtual ~DisplayChangeObserver();
37 37
38 // ui::DisplayConfigurator::StateController overrides: 38 // ui::DisplayConfigurator::StateController overrides:
39 virtual ui::MultipleDisplayState GetStateForDisplayIds( 39 virtual ui::MultipleDisplayState GetStateForDisplayIds(
40 const std::vector<int64>& outputs) const OVERRIDE; 40 const std::vector<int64>& outputs) const override;
41 virtual bool GetResolutionForDisplayId(int64 display_id, 41 virtual bool GetResolutionForDisplayId(int64 display_id,
42 gfx::Size* size) const OVERRIDE; 42 gfx::Size* size) const override;
43 43
44 // Overriden from ui::DisplayConfigurator::Observer: 44 // Overriden from ui::DisplayConfigurator::Observer:
45 virtual void OnDisplayModeChanged( 45 virtual void OnDisplayModeChanged(
46 const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; 46 const ui::DisplayConfigurator::DisplayStateList& outputs) override;
47 47
48 // Overriden from ui::InputDeviceEventObserver: 48 // Overriden from ui::InputDeviceEventObserver:
49 virtual void OnInputDeviceConfigurationChanged() OVERRIDE; 49 virtual void OnInputDeviceConfigurationChanged() override;
50 50
51 // Overriden from ShellObserver: 51 // Overriden from ShellObserver:
52 virtual void OnAppTerminating() OVERRIDE; 52 virtual void OnAppTerminating() override;
53 53
54 // Exposed for testing. 54 // Exposed for testing.
55 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); 55 ASH_EXPORT static float FindDeviceScaleFactor(float dpi);
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); 58 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver);
59 }; 59 };
60 60
61 } // namespace ash 61 } // namespace ash
62 62
63 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H 63 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698