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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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 | « views/controls/button/text_button.cc ('k') | views/controls/combobox/native_combobox_gtk.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) 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 "views/controls/combobox/combobox.h" 5 #include "views/controls/combobox/combobox.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "ui/base/accessibility/accessible_view_state.h" 9 #include "ui/base/accessibility/accessible_view_state.h"
10 #include "ui/base/keycodes/keyboard_codes.h" 10 #include "ui/base/keycodes/keyboard_codes.h"
11 #include "ui/base/models/combobox_model.h" 11 #include "ui/base/models/combobox_model.h"
12 #include "ui/views/widget/widget.h"
12 #include "views/controls/native/native_view_host.h" 13 #include "views/controls/native/native_view_host.h"
13 #include "views/widget/widget.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 // static 17 // static
18 const char Combobox::kViewClassName[] = "views/Combobox"; 18 const char Combobox::kViewClassName[] = "views/Combobox";
19 19
20 //////////////////////////////////////////////////////////////////////////////// 20 ////////////////////////////////////////////////////////////////////////////////
21 // Combobox, public: 21 // Combobox, public:
22 22
23 Combobox::Combobox(ui::ComboboxModel* model) 23 Combobox::Combobox(ui::ComboboxModel* model)
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this); 133 native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
134 AddChildView(native_wrapper_->GetView()); 134 AddChildView(native_wrapper_->GetView());
135 } 135 }
136 } 136 }
137 137
138 std::string Combobox::GetClassName() const { 138 std::string Combobox::GetClassName() const {
139 return kViewClassName; 139 return kViewClassName;
140 } 140 }
141 141
142 } // namespace views 142 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/text_button.cc ('k') | views/controls/combobox/native_combobox_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698