diff options
Diffstat (limited to 'chrome/browser/chromeos/frame/browser_view.h')
| -rw-r--r-- | chrome/browser/chromeos/frame/browser_view.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h index 4da430b..957d07e 100644 --- a/chrome/browser/chromeos/frame/browser_view.h +++ b/chrome/browser/chromeos/frame/browser_view.h @@ -23,7 +23,8 @@ class SimpleMenuModel; namespace views { class ImageButton; class ImageView; -class Menu2; +class MenuDelegate; +class MenuItemView; } // namespace views namespace chromeos { @@ -37,7 +38,7 @@ class StatusAreaButton; // ____ __ __ // / \ \ \ [StatusArea] // -// and adds the system context menu to the remaining arae of the titlebar. +// and adds the system context menu to the remaining area of the titlebar. class BrowserView : public ::BrowserView, public views::ContextMenuController, public views::MenuListener, @@ -46,7 +47,7 @@ class BrowserView : public ::BrowserView, explicit BrowserView(Browser* browser); virtual ~BrowserView(); - // BrowserView overrides. + // BrowserView implementation. virtual void Init() OVERRIDE; virtual void Show() OVERRIDE; virtual void ShowInactive() OVERRIDE; @@ -60,7 +61,7 @@ class BrowserView : public ::BrowserView, virtual WindowOpenDisposition GetDispositionForPopupBounds( const gfx::Rect& bounds) OVERRIDE; - // views::ContextMenuController overrides. + // views::ContextMenuController implementation. virtual void ShowContextMenuForView(views::View* source, const gfx::Point& p, bool is_mouse_gesture) OVERRIDE; @@ -94,11 +95,11 @@ class BrowserView : public ::BrowserView, // Status Area view. StatusAreaView* status_area_; - // System menus. - scoped_ptr<ui::SimpleMenuModel> system_menu_contents_; - scoped_ptr<views::Menu2> system_menu_menu_; + // System menu. + scoped_ptr<views::MenuItemView> system_menu_; + scoped_ptr<views::MenuDelegate> system_menu_delegate_; - // Focused native widget before wench menu shows up. We need this to properly + // Focused native widget before wrench menu shows up. We need this to properly // perform cut, copy and paste. See http://crosbug.com/8496 gfx::NativeView saved_focused_widget_; |