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

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

Issue 8511003: Fix to correctly set accessible name of menu item when there is only one child and title is empty (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 416
417 // Command id. 417 // Command id.
418 int command_; 418 int command_;
419 419
420 // Submenu, created via CreateSubmenu. 420 // Submenu, created via CreateSubmenu.
421 SubmenuView* submenu_; 421 SubmenuView* submenu_;
422 422
423 // Title. 423 // Title.
424 string16 title_; 424 string16 title_;
425 425
426 // Accessible name (doesn't include accelerators, etc.).
427 string16 accessible_name_;
428
429 // Icon. 426 // Icon.
430 SkBitmap icon_; 427 SkBitmap icon_;
431 428
432 // Does the title have a mnemonic? Only useful on the root menu item. 429 // Does the title have a mnemonic? Only useful on the root menu item.
433 bool has_mnemonics_; 430 bool has_mnemonics_;
434 431
435 // Should we show the mnemonic? Mnemonics are shown if this is true or 432 // Should we show the mnemonic? Mnemonics are shown if this is true or
436 // MenuConfig says mnemonics should be shown. Only used on the root menu item. 433 // MenuConfig says mnemonics should be shown. Only used on the root menu item.
437 bool show_mnemonics_; 434 bool show_mnemonics_;
438 435
(...skipping 27 matching lines...) Expand all
466 // position of the menu being shown. 463 // position of the menu being shown.
467 MenuPosition requested_menu_position_; 464 MenuPosition requested_menu_position_;
468 MenuPosition actual_menu_position_; 465 MenuPosition actual_menu_position_;
469 466
470 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 467 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
471 }; 468 };
472 469
473 } // namespace views 470 } // namespace views
474 471
475 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 472 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | views/controls/menu/menu_item_view.cc » ('j') | views/controls/menu/menu_item_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698