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

Side by Side Diff: ui/views/controls/combobox/combobox.h

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/button/menu_button.cc ('k') | ui/views/controls/combobox/combobox.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 (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 UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 5 #ifndef UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 6 #define UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL; 60 return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL;
61 } 61 }
62 NativeComboboxWrapper* GetNativeWrapperForTesting() const { 62 NativeComboboxWrapper* GetNativeWrapperForTesting() const {
63 return native_wrapper_; 63 return native_wrapper_;
64 } 64 }
65 65
66 // Overridden from View: 66 // Overridden from View:
67 virtual gfx::Size GetPreferredSize() OVERRIDE; 67 virtual gfx::Size GetPreferredSize() OVERRIDE;
68 virtual void Layout() OVERRIDE; 68 virtual void Layout() OVERRIDE;
69 virtual void OnEnabledChanged() OVERRIDE; 69 virtual void OnEnabledChanged() OVERRIDE;
70 virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE; 70 virtual bool SkipDefaultKeyEventProcessing(const ui::KeyEvent& e) OVERRIDE;
71 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 71 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
72 virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE; 72 virtual bool OnKeyPressed(const ui::KeyEvent& e) OVERRIDE;
73 virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE; 73 virtual bool OnKeyReleased(const ui::KeyEvent& e) OVERRIDE;
74 virtual void OnFocus() OVERRIDE; 74 virtual void OnFocus() OVERRIDE;
75 virtual void OnBlur() OVERRIDE; 75 virtual void OnBlur() OVERRIDE;
76 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 76 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
77 77
78 protected: 78 protected:
79 // Overridden from View: 79 // Overridden from View:
80 virtual void ViewHierarchyChanged(bool is_add, 80 virtual void ViewHierarchyChanged(bool is_add,
81 View* parent, 81 View* parent,
82 View* child) OVERRIDE; 82 View* child) OVERRIDE;
83 virtual std::string GetClassName() const OVERRIDE; 83 virtual std::string GetClassName() const OVERRIDE;
(...skipping 13 matching lines...) Expand all
97 97
98 // The accessible name of this combobox. 98 // The accessible name of this combobox.
99 string16 accessible_name_; 99 string16 accessible_name_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(Combobox); 101 DISALLOW_COPY_AND_ASSIGN(Combobox);
102 }; 102 };
103 103
104 } // namespace views 104 } // namespace views
105 105
106 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_ 106 #endif // UI_VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
OLDNEW
« no previous file with comments | « ui/views/controls/button/menu_button.cc ('k') | ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698