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

Side by Side Diff: ash/keyboard_overlay/keyboard_overlay_view.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/keyboard_overlay/keyboard_overlay_delegate.cc ('k') | ash/keyboard_uma_event_filter.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_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 5 #ifndef ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
6 #define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 6 #define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/content_support/ash_with_content_export.h" 10 #include "ash/content_support/ash_with_content_export.h"
(...skipping 23 matching lines...) Expand all
34 ui::KeyboardCode key_code; 34 ui::KeyboardCode key_code;
35 int flags; 35 int flags;
36 }; 36 };
37 37
38 KeyboardOverlayView(content::BrowserContext* context, 38 KeyboardOverlayView(content::BrowserContext* context,
39 ui::WebDialogDelegate* delegate, 39 ui::WebDialogDelegate* delegate,
40 WebContentsHandler* handler); 40 WebContentsHandler* handler);
41 virtual ~KeyboardOverlayView(); 41 virtual ~KeyboardOverlayView();
42 42
43 // Overridden from ash::OverlayEventFilter::Delegate: 43 // Overridden from ash::OverlayEventFilter::Delegate:
44 virtual void Cancel() OVERRIDE; 44 virtual void Cancel() override;
45 virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE; 45 virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) override;
46 virtual aura::Window* GetWindow() OVERRIDE; 46 virtual aura::Window* GetWindow() override;
47 47
48 // Shows the keyboard overlay. 48 // Shows the keyboard overlay.
49 static void ShowDialog(content::BrowserContext* context, 49 static void ShowDialog(content::BrowserContext* context,
50 WebContentsHandler* handler, 50 WebContentsHandler* handler,
51 const GURL& url); 51 const GURL& url);
52 52
53 private: 53 private:
54 FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, OpenAcceleratorsClose); 54 FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, OpenAcceleratorsClose);
55 FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, NoRedundantCancelingKeys); 55 FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, NoRedundantCancelingKeys);
56 56
57 // Overridden from views::WidgetDelegate: 57 // Overridden from views::WidgetDelegate:
58 virtual void WindowClosing() OVERRIDE; 58 virtual void WindowClosing() override;
59 59
60 static void GetCancelingKeysForTesting( 60 static void GetCancelingKeysForTesting(
61 std::vector<KeyEventData>* canceling_keys); 61 std::vector<KeyEventData>* canceling_keys);
62 62
63 DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView); 63 DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView);
64 }; 64 };
65 65
66 } // namespace ash 66 } // namespace ash
67 67
68 #endif // ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 68 #endif // ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
OLDNEW
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_delegate.cc ('k') | ash/keyboard_uma_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698