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

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

Issue 7825024: For Touch: remove some menu items for experimentation, adjust sizes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reverted blank line suppression Created 9 years, 3 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) 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 #ifndef VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 5 #ifndef VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
6 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 6 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 443
444 // Does the title have a mnemonic? Only useful on the root menu item. 444 // Does the title have a mnemonic? Only useful on the root menu item.
445 bool has_mnemonics_; 445 bool has_mnemonics_;
446 446
447 // Should we show the mnemonic? Mnemonics are shown if this is true or 447 // Should we show the mnemonic? Mnemonics are shown if this is true or
448 // MenuConfig says mnemonics should be shown. Only used on the root menu item. 448 // MenuConfig says mnemonics should be shown. Only used on the root menu item.
449 bool show_mnemonics_; 449 bool show_mnemonics_;
450 450
451 bool has_icons_; 451 bool has_icons_;
452 452
453 // Should we show the keyboard shortcuts? This is true in most cases
454 // except for touch.
455 bool show_accelerators_;
456
453 // The tooltip to show on hover for this menu item. 457 // The tooltip to show on hover for this menu item.
454 string16 tooltip_; 458 string16 tooltip_;
455 459
456 // X-coordinate of where the label starts. 460 // X-coordinate of where the label starts.
457 static int label_start_; 461 static int label_start_;
458 462
459 // Margins between the right of the item and the label. 463 // Margins between the right of the item and the label.
460 static int item_right_margin_; 464 static int item_right_margin_;
461 465
462 // Preferred height of menu items. Reset every time a menu is run. 466 // Preferred height of menu items. Reset every time a menu is run.
(...skipping 15 matching lines...) Expand all
478 // position of the menu being shown. 482 // position of the menu being shown.
479 MenuPosition requested_menu_position_; 483 MenuPosition requested_menu_position_;
480 MenuPosition actual_menu_position_; 484 MenuPosition actual_menu_position_;
481 485
482 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 486 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
483 }; 487 };
484 488
485 } // namespace views 489 } // namespace views
486 490
487 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 491 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698