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

Side by Side Diff: ash/display/display_change_observer_chromeos.h

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Workaround Created 5 years, 11 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/autoclick/autoclick_unittest.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 <vector> 8 #include <vector>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 17 matching lines...) Expand all
28 // Returns the mode list for internal display. 28 // Returns the mode list for internal display.
29 ASH_EXPORT static std::vector<DisplayMode> GetInternalDisplayModeList( 29 ASH_EXPORT static std::vector<DisplayMode> GetInternalDisplayModeList(
30 const DisplayInfo& display_info, 30 const DisplayInfo& display_info,
31 const ui::DisplayConfigurator::DisplayState& output); 31 const ui::DisplayConfigurator::DisplayState& output);
32 32
33 // Returns the resolution list. 33 // Returns the resolution list.
34 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList( 34 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList(
35 const ui::DisplayConfigurator::DisplayState& output); 35 const ui::DisplayConfigurator::DisplayState& output);
36 36
37 DisplayChangeObserver(); 37 DisplayChangeObserver();
38 virtual ~DisplayChangeObserver(); 38 ~DisplayChangeObserver() override;
39 39
40 // ui::DisplayConfigurator::StateController overrides: 40 // ui::DisplayConfigurator::StateController overrides:
41 virtual ui::MultipleDisplayState GetStateForDisplayIds( 41 ui::MultipleDisplayState GetStateForDisplayIds(
42 const std::vector<int64>& outputs) const override; 42 const std::vector<int64>& outputs) const override;
43 virtual bool GetResolutionForDisplayId(int64 display_id, 43 bool GetResolutionForDisplayId(int64 display_id,
44 gfx::Size* size) const override; 44 gfx::Size* size) const override;
45 45
46 // Overriden from ui::DisplayConfigurator::Observer: 46 // Overriden from ui::DisplayConfigurator::Observer:
47 virtual void OnDisplayModeChanged( 47 void OnDisplayModeChanged(
48 const ui::DisplayConfigurator::DisplayStateList& outputs) override; 48 const ui::DisplayConfigurator::DisplayStateList& outputs) override;
49 49
50 // Overriden from ui::InputDeviceEventObserver: 50 // Overriden from ui::InputDeviceEventObserver:
51 virtual void OnTouchscreenDeviceConfigurationChanged() override; 51 void OnTouchscreenDeviceConfigurationChanged() override;
52 virtual void OnKeyboardDeviceConfigurationChanged() override; 52 void OnKeyboardDeviceConfigurationChanged() override;
53 53
54 // Overriden from ShellObserver: 54 // Overriden from ShellObserver:
55 virtual void OnAppTerminating() override; 55 void OnAppTerminating() override;
56 56
57 // Exposed for testing. 57 // Exposed for testing.
58 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); 58 ASH_EXPORT static float FindDeviceScaleFactor(float dpi);
59 59
60 private: 60 private:
61 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); 61 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ 66 #endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/autoclick/autoclick_unittest.cc ('k') | ash/display/display_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698