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

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

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « views/drag_utils.cc ('k') | views/examples/textfield_example.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_MENU_EXAMPLE_H_ 5 #ifndef VIEWS_EXAMPLES_MENU_EXAMPLE_H_
6 #define VIEWS_EXAMPLES_MENU_EXAMPLE_H_ 6 #define VIEWS_EXAMPLES_MENU_EXAMPLE_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "app/menus/simple_menu_model.h" 10 #include "app/menus/simple_menu_model.h"
11 #include "base/utf_string_conversions.h"
11 #include "views/controls/button/menu_button.h" 12 #include "views/controls/button/menu_button.h"
12 #include "views/controls/menu/menu_2.h" 13 #include "views/controls/menu/menu_2.h"
13 #include "views/controls/menu/view_menu_delegate.h" 14 #include "views/controls/menu/view_menu_delegate.h"
14 #include "views/controls/button/text_button.h" 15 #include "views/controls/button/text_button.h"
15 #include "views/examples/example_base.h" 16 #include "views/examples/example_base.h"
16 #include "views/fill_layout.h" 17 #include "views/fill_layout.h"
17 18
18 namespace examples { 19 namespace examples {
19 20
20 class ExampleMenuContents : public menus::SimpleMenuModel, 21 class ExampleMenuContents : public menus::SimpleMenuModel,
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 container->AddChildView(menu_button); 196 container->AddChildView(menu_button);
196 } 197 }
197 198
198 private: 199 private:
199 DISALLOW_COPY_AND_ASSIGN(MenuExample); 200 DISALLOW_COPY_AND_ASSIGN(MenuExample);
200 }; 201 };
201 202
202 } // namespace examples 203 } // namespace examples
203 204
204 #endif // VIEWS_EXAMPLES_MENU_EXAMPLE_H_ 205 #endif // VIEWS_EXAMPLES_MENU_EXAMPLE_H_
OLDNEW
« no previous file with comments | « views/drag_utils.cc ('k') | views/examples/textfield_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698