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

Side by Side Diff: ui/views/controls/combobox/native_combobox_win.cc

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
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 #include "ui/views/controls/combobox/native_combobox_win.h" 5 #include "ui/views/controls/combobox/native_combobox_win.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "ui/base/event.h"
9 #include "ui/base/models/combobox_model.h" 10 #include "ui/base/models/combobox_model.h"
10 #include "ui/base/native_theme/native_theme_win.h" 11 #include "ui/base/native_theme/native_theme_win.h"
11 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
12 #include "ui/base/win/hwnd_util.h" 13 #include "ui/base/win/hwnd_util.h"
13 #include "ui/gfx/font.h" 14 #include "ui/gfx/font.h"
14 #include "ui/views/controls/combobox/combobox.h" 15 #include "ui/views/controls/combobox/combobox.h"
15 #include "ui/views/controls/combobox/native_combobox_views.h" 16 #include "ui/views/controls/combobox/native_combobox_views.h"
16 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
17 18
18 namespace { 19 namespace {
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 134 }
134 135
135 View* NativeComboboxWin::GetView() { 136 View* NativeComboboxWin::GetView() {
136 return this; 137 return this;
137 } 138 }
138 139
139 void NativeComboboxWin::SetFocus() { 140 void NativeComboboxWin::SetFocus() {
140 OnFocus(); 141 OnFocus();
141 } 142 }
142 143
143 bool NativeComboboxWin::HandleKeyPressed(const views::KeyEvent& event) { 144 bool NativeComboboxWin::HandleKeyPressed(const ui::KeyEvent& event) {
144 return false; 145 return false;
145 } 146 }
146 147
147 bool NativeComboboxWin::HandleKeyReleased(const views::KeyEvent& event) { 148 bool NativeComboboxWin::HandleKeyReleased(const ui::KeyEvent& event) {
148 return false; 149 return false;
149 } 150 }
150 151
151 void NativeComboboxWin::HandleFocus() { 152 void NativeComboboxWin::HandleFocus() {
152 } 153 }
153 154
154 void NativeComboboxWin::HandleBlur() { 155 void NativeComboboxWin::HandleBlur() {
155 } 156 }
156 157
157 gfx::NativeView NativeComboboxWin::GetTestingHandle() const { 158 gfx::NativeView NativeComboboxWin::GetTestingHandle() const {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 209 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
209 Combobox* combobox) { 210 Combobox* combobox) {
210 #if defined(USE_AURA) 211 #if defined(USE_AURA)
211 return new NativeComboboxViews(combobox); 212 return new NativeComboboxViews(combobox);
212 #else 213 #else
213 return new NativeComboboxWin(combobox); 214 return new NativeComboboxWin(combobox);
214 #endif 215 #endif
215 } 216 }
216 217
217 } // namespace views 218 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/combobox/native_combobox_win.h ('k') | ui/views/controls/combobox/native_combobox_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698