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

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

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_gtk.h" 5 #include "ui/views/controls/combobox/native_combobox_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "ui/base/models/combobox_model.h" 13 #include "ui/base/models/combobox_model.h"
14 #include "ui/views/controls/combobox/combobox.h" 14 #include "ui/views/controls/combobox/combobox.h"
15 #include "ui/views/controls/combobox/native_combobox_views.h" 15 #include "ui/views/controls/combobox/native_combobox_views.h"
16 #include "ui/views/views_delegate.h"
16 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
17 #include "views/views_delegate.h"
18 18
19 namespace views { 19 namespace views {
20 20
21 //////////////////////////////////////////////////////////////////////////////// 21 ////////////////////////////////////////////////////////////////////////////////
22 // NativeComboboxGtk, public: 22 // NativeComboboxGtk, public:
23 23
24 NativeComboboxGtk::NativeComboboxGtk(Combobox* combobox) 24 NativeComboboxGtk::NativeComboboxGtk(Combobox* combobox)
25 : combobox_(combobox), 25 : combobox_(combobox),
26 menu_(NULL) { 26 menu_(NULL) {
27 set_focus_view(combobox); 27 set_focus_view(combobox);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 // static 220 // static
221 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( 221 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
222 Combobox* combobox) { 222 Combobox* combobox) {
223 if (Widget::IsPureViews()) 223 if (Widget::IsPureViews())
224 return new NativeComboboxViews(combobox); 224 return new NativeComboboxViews(combobox);
225 return new NativeComboboxGtk(combobox); 225 return new NativeComboboxGtk(combobox);
226 } 226 }
227 227
228 } // namespace views 228 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/text_button.h ('k') | ui/views/controls/combobox/native_combobox_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698