| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/controls/combobox/native_combobox_gtk.h" | 5 #include "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 "app/combobox_model.h" | 11 #include "app/combobox_model.h" |
| 12 #include "base/logging.h" | |
| 13 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 14 #include "views/controls/combobox/combobox.h" | 13 #include "views/controls/combobox/combobox.h" |
| 15 | 14 |
| 16 namespace views { | 15 namespace views { |
| 17 | 16 |
| 18 //////////////////////////////////////////////////////////////////////////////// | 17 //////////////////////////////////////////////////////////////////////////////// |
| 19 // NativeComboboxGtk, public: | 18 // NativeComboboxGtk, public: |
| 20 | 19 |
| 21 NativeComboboxGtk::NativeComboboxGtk(Combobox* combobox) | 20 NativeComboboxGtk::NativeComboboxGtk(Combobox* combobox) |
| 22 : combobox_(combobox) { | 21 : combobox_(combobox) { |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 //////////////////////////////////////////////////////////////////////////////// | 138 //////////////////////////////////////////////////////////////////////////////// |
| 140 // NativeComboboxWrapper, public: | 139 // NativeComboboxWrapper, public: |
| 141 | 140 |
| 142 // static | 141 // static |
| 143 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( | 142 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper( |
| 144 Combobox* combobox) { | 143 Combobox* combobox) { |
| 145 return new NativeComboboxGtk(combobox); | 144 return new NativeComboboxGtk(combobox); |
| 146 } | 145 } |
| 147 | 146 |
| 148 } // namespace views | 147 } // namespace views |
| OLD | NEW |