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

Side by Side Diff: ash/touch/touch_observer_hud.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/system/user/user_card_view.cc ('k') | ash/touch/touch_transformer_controller.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 (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_TOUCH_TOUCH_OBSERVER_HUD_H_ 5 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/display/display_controller.h" 9 #include "ash/display/display_controller.h"
10 #include "ui/events/event_handler.h" 10 #include "ui/events/event_handler.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 void OnWidgetDestroying(views::Widget* widget) override; 59 void OnWidgetDestroying(views::Widget* widget) override;
60 60
61 // Overridden from gfx::DisplayObserver. 61 // Overridden from gfx::DisplayObserver.
62 void OnDisplayAdded(const gfx::Display& new_display) override; 62 void OnDisplayAdded(const gfx::Display& new_display) override;
63 void OnDisplayRemoved(const gfx::Display& old_display) override; 63 void OnDisplayRemoved(const gfx::Display& old_display) override;
64 void OnDisplayMetricsChanged(const gfx::Display& display, 64 void OnDisplayMetricsChanged(const gfx::Display& display,
65 uint32_t metrics) override; 65 uint32_t metrics) override;
66 66
67 #if defined(OS_CHROMEOS) 67 #if defined(OS_CHROMEOS)
68 // Overriden from ui::DisplayConfigurator::Observer. 68 // Overriden from ui::DisplayConfigurator::Observer.
69 virtual void OnDisplayModeChanged( 69 void OnDisplayModeChanged(
70 const ui::DisplayConfigurator::DisplayStateList& outputs) override; 70 const ui::DisplayConfigurator::DisplayStateList& outputs) override;
71 #endif // defined(OS_CHROMEOS) 71 #endif // defined(OS_CHROMEOS)
72 72
73 // Overriden form DisplayController::Observer. 73 // Overriden form DisplayController::Observer.
74 void OnDisplaysInitialized() override; 74 void OnDisplaysInitialized() override;
75 void OnDisplayConfigurationChanging() override; 75 void OnDisplayConfigurationChanging() override;
76 void OnDisplayConfigurationChanged() override; 76 void OnDisplayConfigurationChanged() override;
77 77
78 private: 78 private:
79 friend class TouchHudTestBase; 79 friend class TouchHudTestBase;
80 80
81 const int64 display_id_; 81 const int64 display_id_;
82 aura::Window* root_window_; 82 aura::Window* root_window_;
83 83
84 views::Widget* widget_; 84 views::Widget* widget_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); 86 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD);
87 }; 87 };
88 88
89 } // namespace ash 89 } // namespace ash
90 90
91 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 91 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW
« no previous file with comments | « ash/system/user/user_card_view.cc ('k') | ash/touch/touch_transformer_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698