diff options
Diffstat (limited to 'views/controls/menu/submenu_view.h')
| -rw-r--r-- | views/controls/menu/submenu_view.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h index 50f9a6b..f0bed4a 100644 --- a/views/controls/menu/submenu_view.h +++ b/views/controls/menu/submenu_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -107,7 +107,7 @@ class SubmenuView : public View { virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e); // Returns the parent menu item we're showing children for. - MenuItemView* GetMenuItem() const { return parent_menu_item_; } + MenuItemView* GetMenuItem() const; // Set the drop item and position. void SetDropMenuItem(MenuItemView* item, @@ -176,6 +176,9 @@ class SubmenuView : public View { // See description above getter. int max_accelerator_width_; + // TODO(msw): Resolve crasher crbug.com/78792. + int magic_token_; + DISALLOW_COPY_AND_ASSIGN(SubmenuView); }; |