| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ | 6 #define CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ |
| 7 | 7 |
| 8 #include "app/menus/simple_menu_model.h" | 8 #include "app/menus/simple_menu_model.h" |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "chrome/browser/chromeos/status/status_area_view.h" | 10 #include "chrome/browser/chromeos/status/status_area_view.h" |
| 11 #include "views/controls/menu/view_menu_delegate.h" | 11 #include "views/controls/menu/view_menu_delegate.h" |
| 12 #include "views/controls/menu/menu_2.h" | 12 #include "views/controls/menu/menu_2.h" |
| 13 #include "views/view.h" | 13 #include "views/view.h" |
| 14 | 14 |
| 15 class AppMenuModel; | |
| 16 | |
| 17 namespace chromeos { | 15 namespace chromeos { |
| 18 | 16 |
| 19 class BrowserView; | 17 class BrowserView; |
| 20 class StatusAreaButton; | 18 class StatusAreaButton; |
| 21 | 19 |
| 22 // StatusAreView specialization specific for Chrome browser. | 20 // StatusAreView specialization specific for Chrome browser. |
| 23 // Adds a menu button visible in compact location bar mode. | 21 // Adds a menu button visible in compact location bar mode. |
| 24 class BrowserStatusAreaView : public StatusAreaView, | 22 class BrowserStatusAreaView : public StatusAreaView, |
| 25 public menus::SimpleMenuModel::Delegate, | 23 public menus::SimpleMenuModel::Delegate, |
| 26 public views::ViewMenuDelegate { | 24 public views::ViewMenuDelegate { |
| 27 public: | 25 public: |
| 28 explicit BrowserStatusAreaView(BrowserView* browser_view); | 26 explicit BrowserStatusAreaView(BrowserView* browser_view); |
| 29 virtual ~BrowserStatusAreaView() {} | 27 virtual ~BrowserStatusAreaView() {} |
| 30 | 28 |
| 31 virtual void Init(); | 29 virtual void Init(); |
| 32 | 30 |
| 33 // Creates an AppMenuModel for chromeos. | 31 // Creates the app menu model. |
| 34 AppMenuModel* CreateAppMenuModel(menus::SimpleMenuModel::Delegate* delegate); | 32 menus::SimpleMenuModel* CreateAppMenuModel( |
| 33 menus::SimpleMenuModel::Delegate* delegate); |
| 35 | 34 |
| 36 StatusAreaButton* menu_view() const { return menu_view_; } | 35 StatusAreaButton* menu_view() const { return menu_view_; } |
| 37 | 36 |
| 38 private: | 37 private: |
| 39 | 38 |
| 40 // menus::SimpleMenuModel::Delegate implementation. | 39 // menus::SimpleMenuModel::Delegate implementation. |
| 41 virtual bool IsCommandIdChecked(int command_id) const; | 40 virtual bool IsCommandIdChecked(int command_id) const; |
| 42 virtual bool IsCommandIdEnabled(int command_id) const; | 41 virtual bool IsCommandIdEnabled(int command_id) const; |
| 43 virtual bool GetAcceleratorForCommandId(int command_id, | 42 virtual bool GetAcceleratorForCommandId(int command_id, |
| 44 menus::Accelerator* accelerator); | 43 menus::Accelerator* accelerator); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 55 scoped_ptr<menus::SimpleMenuModel> app_menu_contents_; | 54 scoped_ptr<menus::SimpleMenuModel> app_menu_contents_; |
| 56 scoped_ptr<menus::SimpleMenuModel> options_menu_contents_; | 55 scoped_ptr<menus::SimpleMenuModel> options_menu_contents_; |
| 57 scoped_ptr<views::Menu2> app_menu_menu_; | 56 scoped_ptr<views::Menu2> app_menu_menu_; |
| 58 | 57 |
| 59 DISALLOW_COPY_AND_ASSIGN(BrowserStatusAreaView); | 58 DISALLOW_COPY_AND_ASSIGN(BrowserStatusAreaView); |
| 60 }; | 59 }; |
| 61 | 60 |
| 62 } // namespace chromeos | 61 } // namespace chromeos |
| 63 | 62 |
| 64 #endif // CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ | 63 #endif // CHROME_BROWSER_CHROMEOS_STATUS_BROWSER_STATUS_AREA_VIEW_H_ |
| OLD | NEW |