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

Side by Side Diff: ui/views/examples/menu_example.cc

Issue 8742030: views: Move view.h to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and fix conflicts 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
« no previous file with comments | « ui/views/examples/link_example.cc ('k') | ui/views/examples/message_box_example.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 "ui/views/examples/menu_example.h" 5 #include "ui/views/examples/menu_example.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/models/simple_menu_model.h" 10 #include "ui/base/models/simple_menu_model.h"
11 #include "ui/views/controls/button/menu_button.h" 11 #include "ui/views/controls/button/menu_button.h"
12 #include "ui/views/controls/button/text_button.h" 12 #include "ui/views/controls/button/text_button.h"
13 #include "ui/views/controls/menu/menu_2.h" 13 #include "ui/views/controls/menu/menu_2.h"
14 #include "ui/views/controls/menu/view_menu_delegate.h" 14 #include "ui/views/controls/menu/view_menu_delegate.h"
15 #include "ui/views/layout/fill_layout.h" 15 #include "ui/views/layout/fill_layout.h"
16 #include "views/view.h" 16 #include "ui/views/view.h"
17 17
18 namespace views { 18 namespace views {
19 namespace examples { 19 namespace examples {
20 20
21 namespace { 21 namespace {
22 22
23 class ExampleMenuModel : public ui::SimpleMenuModel, 23 class ExampleMenuModel : public ui::SimpleMenuModel,
24 public ui::SimpleMenuModel::Delegate { 24 public ui::SimpleMenuModel::Delegate {
25 public: 25 public:
26 ExampleMenuModel(); 26 ExampleMenuModel();
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 // add to the container. Instead, we add a button to open a menu. 207 // add to the container. Instead, we add a button to open a menu.
208 const bool show_menu_marker = true; 208 const bool show_menu_marker = true;
209 ExampleMenuButton* menu_button = new ExampleMenuButton( 209 ExampleMenuButton* menu_button = new ExampleMenuButton(
210 ASCIIToUTF16("Open a menu"), show_menu_marker); 210 ASCIIToUTF16("Open a menu"), show_menu_marker);
211 container->SetLayoutManager(new FillLayout); 211 container->SetLayoutManager(new FillLayout);
212 container->AddChildView(menu_button); 212 container->AddChildView(menu_button);
213 } 213 }
214 214
215 } // namespace examples 215 } // namespace examples
216 } // namespace views 216 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/examples/link_example.cc ('k') | ui/views/examples/message_box_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698