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

Side by Side Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.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/chromeos/tray_tracing.cc ('k') | ash/system/ime/tray_ime_chromeos_unittest.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_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
6 #define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 6 #define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
7 7
8 #include "ash/system/tray/tray_background_view.h" 8 #include "ash/system/tray/tray_background_view.h"
9 #include "ash/system/tray_accessibility.h" 9 #include "ash/system/tray_accessibility.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
13 13
14 namespace views { 14 namespace views {
15 class ImageButton; 15 class ImageButton;
16 } 16 }
17 17
18 namespace ash { 18 namespace ash {
19 class StatusAreaWidget; 19 class StatusAreaWidget;
20 20
21 class VirtualKeyboardTray : public TrayBackgroundView, 21 class VirtualKeyboardTray : public TrayBackgroundView,
22 public views::ButtonListener, 22 public views::ButtonListener,
23 public AccessibilityObserver { 23 public AccessibilityObserver {
24 public: 24 public:
25 explicit VirtualKeyboardTray(StatusAreaWidget* status_area_widget); 25 explicit VirtualKeyboardTray(StatusAreaWidget* status_area_widget);
26 virtual ~VirtualKeyboardTray(); 26 ~VirtualKeyboardTray() override;
27 27
28 // TrayBackgroundView: 28 // TrayBackgroundView:
29 virtual void SetShelfAlignment(ShelfAlignment alignment) override; 29 void SetShelfAlignment(ShelfAlignment alignment) override;
30 virtual base::string16 GetAccessibleNameForTray() override; 30 base::string16 GetAccessibleNameForTray() override;
31 virtual void HideBubbleWithView( 31 void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
32 const views::TrayBubbleView* bubble_view) override; 32 bool ClickedOutsideBubble() override;
33 virtual bool ClickedOutsideBubble() override; 33 bool PerformAction(const ui::Event& event) override;
34 virtual bool PerformAction(const ui::Event& event) override;
35 34
36 // views::ButtonListener: 35 // views::ButtonListener:
37 virtual void ButtonPressed(views::Button* sender, 36 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
38 const ui::Event& event) override;
39 37
40 // AccessibilityObserver: 38 // AccessibilityObserver:
41 virtual void OnAccessibilityModeChanged( 39 void OnAccessibilityModeChanged(
42 ui::AccessibilityNotificationVisibility notify) override; 40 ui::AccessibilityNotificationVisibility notify) override;
43 41
44 private: 42 private:
45 views::ImageButton* button_; // Not owned. 43 views::ImageButton* button_; // Not owned.
46 44
47 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray); 45 DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardTray);
48 }; 46 };
49 47
50 } // namespace ash 48 } // namespace ash
51 49
52 #endif // ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_ 50 #endif // ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_tracing.cc ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698