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

Side by Side Diff: views/examples/combobox_example.h

Issue 6360014: views: Move fill_layout.[cc,h] into layout directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ 5 #ifndef VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
6 #define VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ 6 #define VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "ui/base/models/combobox_model.h" 11 #include "ui/base/models/combobox_model.h"
12 #include "views/controls/combobox/combobox.h" 12 #include "views/controls/combobox/combobox.h"
13 #include "views/examples/example_base.h" 13 #include "views/examples/example_base.h"
14 #include "views/fill_layout.h" 14 #include "views/layout/fill_layout.h"
15 15
16 using ui::ComboboxModel; // TODO(beng): remove 16 using ui::ComboboxModel; // TODO(beng): remove
17 17
18 namespace examples { 18 namespace examples {
19 19
20 // ComboboxExample 20 // ComboboxExample
21 class ComboboxExample : public ExampleBase, public views::Combobox::Listener { 21 class ComboboxExample : public ExampleBase, public views::Combobox::Listener {
22 public: 22 public:
23 explicit ComboboxExample(ExamplesMain* main) : ExampleBase(main) { 23 explicit ComboboxExample(ExamplesMain* main) : ExampleBase(main) {
24 combobox_ = new views::Combobox(new ComboboxModelExample()); 24 combobox_ = new views::Combobox(new ComboboxModelExample());
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // This test only control. 67 // This test only control.
68 views::Combobox* combobox_; 68 views::Combobox* combobox_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(ComboboxExample); 70 DISALLOW_COPY_AND_ASSIGN(ComboboxExample);
71 }; 71 };
72 72
73 } // namespace examples 73 } // namespace examples
74 74
75 #endif // VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ 75 #endif // VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698