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

Side by Side Diff: ui/views/controls/menu/menu_item_view.h

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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
« no previous file with comments | « ui/views/controls/menu/menu_controller.cc ('k') | ui/views/controls/menu/menu_item_view.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 MenuDelegate* GetDelegate(); 290 MenuDelegate* GetDelegate();
291 const MenuDelegate* GetDelegate() const; 291 const MenuDelegate* GetDelegate() const;
292 void set_delegate(MenuDelegate* delegate) { delegate_ = delegate; } 292 void set_delegate(MenuDelegate* delegate) { delegate_ = delegate; }
293 293
294 // Returns the root parent, or this if this has no parent. 294 // Returns the root parent, or this if this has no parent.
295 MenuItemView* GetRootMenuItem(); 295 MenuItemView* GetRootMenuItem();
296 const MenuItemView* GetRootMenuItem() const; 296 const MenuItemView* GetRootMenuItem() const;
297 297
298 // Returns the mnemonic for this MenuItemView, or 0 if this MenuItemView 298 // Returns the mnemonic for this MenuItemView, or 0 if this MenuItemView
299 // doesn't have a mnemonic. 299 // doesn't have a mnemonic.
300 char16 GetMnemonic(); 300 base::char16 GetMnemonic();
301 301
302 // Do we have icons? This only has effect on the top menu. Turning this on 302 // Do we have icons? This only has effect on the top menu. Turning this on
303 // makes the menus slightly wider and taller. 303 // makes the menus slightly wider and taller.
304 void set_has_icons(bool has_icons) { 304 void set_has_icons(bool has_icons) {
305 has_icons_ = has_icons; 305 has_icons_ = has_icons;
306 } 306 }
307 bool has_icons() const { return has_icons_; } 307 bool has_icons() const { return has_icons_; }
308 308
309 // Returns the descendant with the specified command. 309 // Returns the descendant with the specified command.
310 MenuItemView* GetMenuItemByID(int id); 310 MenuItemView* GetMenuItemByID(int id);
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 // If set to false, the right margin will be removed for menu lines 525 // If set to false, the right margin will be removed for menu lines
526 // containing other elements. 526 // containing other elements.
527 bool use_right_margin_; 527 bool use_right_margin_;
528 528
529 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 529 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
530 }; 530 };
531 531
532 } // namespace views 532 } // namespace views
533 533
534 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 534 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_controller.cc ('k') | ui/views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698