diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 20:30:10 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 20:30:10 +0000 |
| commit | fca656cb7bd5737a18c809d8f44edc6a99e6bb9a (patch) | |
| tree | 477a3061a64a4f845642c7de780864214201e3f0 /chrome/browser/tab_menu_model.cc | |
| parent | 381f69ad5478d24e5bbb448727c05379204c87d3 (diff) | |
| download | chromium_src-fca656cb7bd5737a18c809d8f44edc6a99e6bb9a.zip chromium_src-fca656cb7bd5737a18c809d8f44edc6a99e6bb9a.tar.gz chromium_src-fca656cb7bd5737a18c809d8f44edc6a99e6bb9a.tar.bz2 | |
Adds code to restore application extensions. I'm also enabling tab
pinning on views again as everything in place, except a couple of
bugs.
BUG=32845
TEST=none
Review URL: http://codereview.chromium.org/598027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_menu_model.cc')
| -rw-r--r-- | chrome/browser/tab_menu_model.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/tab_menu_model.cc index 986d352..f0fe251 100644 --- a/chrome/browser/tab_menu_model.cc +++ b/chrome/browser/tab_menu_model.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_menu_model.h" +#include "chrome/browser/defaults.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "grit/generated_resources.h" @@ -18,17 +19,17 @@ void TabMenuModel::Build() { AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD); AddItemWithStringId(TabStripModel::CommandDuplicate, IDS_TAB_CXMENU_DUPLICATE); -#if defined(ENABLE_PINNED_TABS) + if (browser_defaults::kEnablePinnedTabs) { // On Mac the HIG prefers "pin/unpin" to a checkmark. The Mac code will fix up // the actual string based on the tab's state via the delegate. #if defined(OS_MACOSX) - AddItemWithStringId(TabStripModel::CommandTogglePinned, - IDS_TAB_CXMENU_PIN_TAB); + AddItemWithStringId(TabStripModel::CommandTogglePinned, + IDS_TAB_CXMENU_PIN_TAB); #else - AddCheckItemWithStringId(TabStripModel::CommandTogglePinned, - IDS_TAB_CXMENU_PIN_TAB); -#endif + AddCheckItemWithStringId(TabStripModel::CommandTogglePinned, + IDS_TAB_CXMENU_PIN_TAB); #endif + } AddSeparator(); AddItemWithStringId(TabStripModel::CommandCloseTab, IDS_TAB_CXMENU_CLOSETAB); |