diff options
| author | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 18:56:09 +0000 |
|---|---|---|
| committer | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 18:56:09 +0000 |
| commit | 568c64abe99a3d23ab9e213b98c5df4691322522 (patch) | |
| tree | 1523e1e8309a3fe5858b823d371182b11c850143 /ui/views/controls/menu/submenu_view.cc | |
| parent | 92daa1afc249cdbbaf6d28e84b49854f8b1bf3c9 (diff) | |
| download | chromium_src-568c64abe99a3d23ab9e213b98c5df4691322522.zip chromium_src-568c64abe99a3d23ab9e213b98c5df4691322522.tar.gz chromium_src-568c64abe99a3d23ab9e213b98c5df4691322522.tar.bz2 | |
Added MenuConfig setter to MenuItemView, updated rest of the code to use set MenuConfig if it available.
BUG=125307
Review URL: https://chromiumcodereview.appspot.com/11026076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/menu/submenu_view.cc')
| -rw-r--r-- | ui/views/controls/menu/submenu_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc index a84b3ec..12d63ed 100644 --- a/ui/views/controls/menu/submenu_view.cc +++ b/ui/views/controls/menu/submenu_view.cc @@ -152,7 +152,7 @@ gfx::Size SubmenuView::GetPreferredSize() { } if (max_accelerator_width_ > 0) { max_accelerator_width_ += - MenuConfig::instance().label_to_accelerator_padding; + GetMenuItem()->GetMenuConfig().label_to_accelerator_padding; } gfx::Insets insets = GetInsets(); return gfx::Size( |