diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 17:50:26 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 17:50:26 +0000 |
| commit | b284843ba6a1e90c12f91eaf796726433dc2537d (patch) | |
| tree | 96edc5a4528e4d685c89544bfc13712e2984964a /chrome/browser/chromeos/browser_extenders.cc | |
| parent | e83ce1e3f2fcacb3d400287d78567d22a2a06cae (diff) | |
| download | chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.zip chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.tar.gz chromium_src-b284843ba6a1e90c12f91eaf796726433dc2537d.tar.bz2 | |
Refactor the menu model to live outside views/ so it can be shared
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/465005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/browser_extenders.cc')
| -rw-r--r-- | chrome/browser/chromeos/browser_extenders.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/browser_extenders.cc b/chrome/browser/chromeos/browser_extenders.cc index 6fcc117..63111a1 100644 --- a/chrome/browser/chromeos/browser_extenders.cc +++ b/chrome/browser/chromeos/browser_extenders.cc @@ -4,6 +4,7 @@ #include <algorithm> +#include "app/menus/simple_menu_model.h" #include "app/theme_provider.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/chromeos/compact_location_bar.h" @@ -22,7 +23,7 @@ #include "grit/theme_resources.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" -#include "views/controls/menu/simple_menu_model.h" +#include "views/controls/menu/menu_2.h" #include "views/window/window.h" namespace { @@ -223,7 +224,7 @@ class NormalExtender : public BrowserExtender, // Creates system menu. void InitSystemMenu() { - system_menu_contents_.reset(new views::SimpleMenuModel(browser_view())); + system_menu_contents_.reset(new menus::SimpleMenuModel(browser_view())); system_menu_contents_->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB); @@ -253,7 +254,7 @@ class NormalExtender : public BrowserExtender, chromeos::StatusAreaView* status_area_; // System menus. - scoped_ptr<views::SimpleMenuModel> system_menu_contents_; + scoped_ptr<menus::SimpleMenuModel> system_menu_contents_; scoped_ptr<views::Menu2> system_menu_menu_; // CompactNavigationBar view. |