Skip to content

GitLab

T
tangled
Commit 486cf595 authored by sky@chromium.org's avatar sky@chromium.org
Browse files
Options

Nukes wrench_menu_model_chromeos and folds functionality int 

wrench_menu_model. Chromeos no longer diverges that much from current.

BUG=123233
TEST=make sure menu layout is right.
R=saintlou@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10038033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132275 0039d316-1c4b-4281-b951-d872f2087c98
parent 2a44801e
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 95 deletions
chrome/browser/defaults.cc
View file @ 486cf595
......@@ -29,7 +29,11 @@ const int kMiniTabWidth = 64;
const bool kCanToggleSystemTitleBar = false;
const bool kRestorePopups = false;
const bool kShowImportOnBookmarkBar = false;
const bool kShowExitMenuItem = true;
const bool kShowExitMenuItem = false;
const bool kShowFeedbackMenuItem = true;
const bool kShowHelpMenuItemIcon = true;
const bool kShowSyncSetupMenuItem = false;
const bool kShowUpgradeMenuItem = false;
const bool kDownloadPageHasShowInFolder = true;
const bool kSizeTabButtonToTopOfTabStrip = false;
const bool kSyncAutoStarts = true;
......@@ -65,6 +69,10 @@ const bool kShowExitMenuItem = false;
#else
const bool kShowExitMenuItem = true;
#endif
const bool kShowFeedbackMenuItem = false;
const bool kShowHelpMenuItemIcon = false;
const bool kShowSyncSetupMenuItem = true;
const bool kShowUpgradeMenuItem = true;
const bool kSizeTabButtonToTopOfTabStrip = false;
const bool kSyncAutoStarts = false;
const bool kShowOtherBrowsersInAboutMemory = true;
......
chrome/browser/defaults.h
View file @ 486cf595
......@@ -40,8 +40,12 @@ extern const bool kBrowserAliveWithNoWindows;
// bookmarks?
extern const bool kShowImportOnBookmarkBar;
// Should the exit menu item be shown in the toolbar menu?
// Whether various menu items are shown.
extern const bool kShowExitMenuItem;
extern const bool kShowFeedbackMenuItem;
extern const bool kShowHelpMenuItemIcon;
extern const bool kShowSyncSetupMenuItem;
extern const bool kShowUpgradeMenuItem;
// Does the OS support other browsers? If not, operations such as default
// browser check are not done.
......
chrome/browser/ui/toolbar/wrench_menu_model.cc
View file @ 486cf595
......@@ -429,11 +429,15 @@ WrenchMenuModel::WrenchMenuModel()
tabstrip_model_(NULL) {
}
#if !defined(OS_CHROMEOS)
void WrenchMenuModel::Build() {
AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
#if defined(OS_CHROMEOS)
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
#else
AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
#endif
bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
......@@ -489,7 +493,8 @@ void WrenchMenuModel::Build() {
AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
AddSeparator();
if (browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
if (browser_defaults::kShowSyncSetupMenuItem &&
browser_->profile()->GetOriginalProfile()->IsSyncAccessible()) {
const string16 short_product_name =
l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
AddItem(IDC_SHOW_SYNC_SETUP, l10n_util::GetStringFUTF16(
......@@ -503,17 +508,26 @@ void WrenchMenuModel::Build() {
TaskManager::GetBackgroundPageCount());
AddItem(IDC_VIEW_BACKGROUND_PAGES, l10n_util::GetStringFUTF16(
IDS_VIEW_BACKGROUND_PAGES, num_background_pages));
AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
if (browser_defaults::kShowUpgradeMenuItem)
AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
IDS_VIEW_INCOMPATIBILITIES));
#if defined(OS_WIN)
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
*rb.GetBitmapNamed(IDR_CONFLICT_MENU));
*ui::ResourceBundle::GetSharedInstance().
GetBitmapNamed(IDR_CONFLICT_MENU));
#endif
AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
if (browser_defaults::kShowHelpMenuItemIcon) {
ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE),
*rb.GetBitmapNamed(IDR_HELP_MENU));
}
if (browser_defaults::kShowFeedbackMenuItem)
AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
AddGlobalErrorMenuItems();
......@@ -522,7 +536,6 @@ void WrenchMenuModel::Build() {
AddItemWithStringId(IDC_EXIT, IDS_EXIT);
}
}
#endif // !OS_CHROMEOS
void WrenchMenuModel::AddGlobalErrorMenuItems() {
// TODO(sail): Currently we only build the wrench menu once per browser
......
chrome/browser/ui/toolbar/wrench_menu_model_chromeos.cc deleted 100644 → 0
View file @ 2a44801e
// Copyright (c) 2012 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.
#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
#include "base/command_line.h"
#include "base/i18n/number_formatting.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/common/chrome_switches.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
void WrenchMenuModel::Build() {
AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession))
AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
AddSeparator();
CreateCutCopyPaste();
AddSeparator();
CreateZoomFullscreen();
AddSeparator();
AddItemWithStringId(IDC_SAVE_PAGE, IDS_SAVE_PAGE);
AddItemWithStringId(IDC_FIND, IDS_FIND);
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
tools_menu_model_.reset(new ToolsMenuModel(this, browser_));
AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_TOOLS_MENU,
tools_menu_model_.get());
AddSeparator();
bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
bookmark_sub_menu_model_.get());
AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
AddSeparator();
AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
AddItem(IDC_ABOUT, l10n_util::GetStringUTF16(IDS_ABOUT));
string16 num_background_pages = base::FormatNumber(
TaskManager::GetBackgroundPageCount());
AddItem(IDC_VIEW_BACKGROUND_PAGES,
l10n_util::GetStringFUTF16(IDS_VIEW_BACKGROUND_PAGES,
num_background_pages));
AddItem(IDC_VIEW_INCOMPATIBILITIES,
l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));
// Use an icon for IDC_HELP_PAGE menu item.
AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
SetIcon(GetIndexOfCommandId(IDC_HELP_PAGE),
*rb.GetBitmapNamed(IDR_HELP_MENU));
// Show IDC_FEEDBACK in top-tier wrench menu for ChromeOS.
AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
AddGlobalErrorMenuItems();
#if !defined(USE_ASH)
AddSeparator();
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
AddItemWithStringId(IDC_SHUTDOWN, IDS_SHUTDOWN_BUTTON);
} else if (chromeos::UserManager::Get()->IsLoggedInAsDemoUser()) {
AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
} else {
AddItemWithStringId(IDC_LOCK_SCREEN, IDS_LOCK_SCREEN);
AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
AddItemWithStringId(IDC_SHUTDOWN, IDS_SHUTDOWN_BUTTON);
}
#endif
}
chrome/chrome_browser.gypi
View file @ 486cf595
......@@ -3192,7 +3192,6 @@
'browser/ui/toolbar/toolbar_model_delegate.h',
'browser/ui/toolbar/wrench_menu_model.cc',
'browser/ui/toolbar/wrench_menu_model.h',
'browser/ui/toolbar/wrench_menu_model_chromeos.cc',
'browser/ui/touch/status_bubble_touch.cc',
'browser/ui/touch/status_bubble_touch.h',
'browser/ui/view_ids.h',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment