Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3403)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmark_bar_context_menu_controller.cc

Issue 7357: Makes the following changes to the bookmark bar context menu:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/app/generated_resources.grd ('K') | « chrome/browser/bookmark_bar_context_menu_controller.h ('k') | chrome/browser/bookmark_bar_context_menu_controller_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmark_bar_context_menu_controller.cc
===================================================================
--- chrome/browser/bookmark_bar_context_menu_controller.cc (revision 3428)
+++ chrome/browser/bookmark_bar_context_menu_controller.cc (working copy)
@@ -193,18 +193,6 @@
// BookmarkBarContextMenuController -------------------------------------------
-const int BookmarkBarContextMenuController::always_show_command_id = 1;
-const int BookmarkBarContextMenuController::open_bookmark_id = 2;
-const int BookmarkBarContextMenuController::open_bookmark_in_new_window_id = 3;
-const int BookmarkBarContextMenuController::open_bookmark_in_new_tab_id = 4;
-const int BookmarkBarContextMenuController::open_all_bookmarks_id = 5;
-const int
- BookmarkBarContextMenuController::open_all_bookmarks_in_new_window_id = 6;
-const int BookmarkBarContextMenuController::edit_bookmark_id = 7;
-const int BookmarkBarContextMenuController::delete_bookmark_id = 8;
-const int BookmarkBarContextMenuController::add_bookmark_id = 9;
-const int BookmarkBarContextMenuController::new_folder_id = 10;
-
// static
void BookmarkBarContextMenuController::OpenAll(
HWND parent,
@@ -227,41 +215,44 @@
menu_(this) {
if (node->GetType() == history::StarredEntry::URL) {
menu_.AppendMenuItemWithLabel(
- open_bookmark_id,
- l10n_util::GetString(IDS_BOOMARK_BAR_OPEN));
- menu_.AppendMenuItemWithLabel(
- open_bookmark_in_new_tab_id,
+ IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB,
l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB));
menu_.AppendMenuItemWithLabel(
- open_bookmark_in_new_window_id,
+ IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW,
l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW));
+ menu_.AppendMenuItemWithLabel(
+ IDS_BOOMARK_BAR_OPEN_INCOGNITO,
+ l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_INCOGNITO));
} else {
menu_.AppendMenuItemWithLabel(
- open_all_bookmarks_id,
+ IDS_BOOMARK_BAR_OPEN_ALL,
l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_ALL));
menu_.AppendMenuItemWithLabel(
- open_all_bookmarks_in_new_window_id,
+ IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW,
l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW));
+ menu_.AppendMenuItemWithLabel(
+ IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO,
+ l10n_util::GetString(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO));
}
menu_.AppendSeparator();
if (node->GetParent() !=
view->GetProfile()->GetBookmarkModel()->root_node()) {
- menu_.AppendMenuItemWithLabel(edit_bookmark_id,
+ menu_.AppendMenuItemWithLabel(IDS_BOOKMARK_BAR_EDIT,
l10n_util::GetString(IDS_BOOKMARK_BAR_EDIT));
menu_.AppendMenuItemWithLabel(
- delete_bookmark_id,
+ IDS_BOOKMARK_BAR_REMOVE,
l10n_util::GetString(IDS_BOOKMARK_BAR_REMOVE));
}
menu_.AppendMenuItemWithLabel(
- add_bookmark_id,
+ IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK,
l10n_util::GetString(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK));
menu_.AppendMenuItemWithLabel(
- new_folder_id,
+ IDS_BOOMARK_BAR_NEW_FOLDER,
l10n_util::GetString(IDS_BOOMARK_BAR_NEW_FOLDER));
menu_.AppendSeparator();
- menu_.AppendMenuItem(always_show_command_id,
+ menu_.AppendMenuItem(IDS_BOOMARK_BAR_ALWAYS_SHOW,
l10n_util::GetString(IDS_BOOMARK_BAR_ALWAYS_SHOW),
ChromeViews::MenuItemView::CHECKBOX);
}
@@ -289,14 +280,15 @@
Profile* profile = view_->GetProfile();
switch (id) {
- case open_bookmark_id:
- UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Open", profile);
+ case IDS_BOOMARK_BAR_OPEN_INCOGNITO:
+ UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenInIncognito",
+ profile);
- view_->GetPageNavigator()->OpenURL(node_->GetURL(), CURRENT_TAB,
+ view_->GetPageNavigator()->OpenURL(node_->GetURL(), OFF_THE_RECORD,
PageTransition::AUTO_BOOKMARK);
break;
- case open_bookmark_in_new_window_id:
+ case IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW:
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenInNewWindow",
profile);
@@ -304,7 +296,7 @@
PageTransition::AUTO_BOOKMARK);
break;
- case open_bookmark_in_new_tab_id:
+ case IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB:
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenInNewTab",
profile);
@@ -312,22 +304,24 @@
PageTransition::AUTO_BOOKMARK);
break;
- case open_all_bookmarks_id:
- case open_all_bookmarks_in_new_window_id: {
- if (id == open_all_bookmarks_id) {
+ case IDS_BOOMARK_BAR_OPEN_ALL:
+ case IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO:
+ case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW: {
+ WindowOpenDisposition initial_disposition;
+ if (id == IDS_BOOMARK_BAR_OPEN_ALL) {
+ initial_disposition = CURRENT_TAB;
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_OpenAll",
profile);
+ } else if (id == IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW) {
+ initial_disposition = NEW_WINDOW;
+ UserMetrics::RecordAction(
+ L"BookmarkBar_ContextMenu_OpenAllInNewWindow", profile);
} else {
+ initial_disposition = OFF_THE_RECORD;
UserMetrics::RecordAction(
- L"BookmarkBar_ContextMenu_OpenAllInNewWindow", profile);
+ L"BookmarkBar_ContextMenu_OpenAllIncognito", profile);
}
- WindowOpenDisposition initial_disposition;
- if (id == open_all_bookmarks_in_new_window_id)
- initial_disposition = NEW_WINDOW;
- else
- initial_disposition = CURRENT_TAB;
-
// GetViewContainer is NULL during testing.
HWND parent_hwnd = view_->GetViewContainer() ?
view_->GetViewContainer()->GetHWND() : 0;
@@ -337,7 +331,7 @@
break;
}
- case edit_bookmark_id:
+ case IDS_BOOKMARK_BAR_EDIT:
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Edit", profile);
if (node_->GetType() == history::StarredEntry::URL) {
@@ -351,7 +345,7 @@
}
break;
- case delete_bookmark_id: {
+ case IDS_BOOKMARK_BAR_REMOVE: {
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Remove", profile);
view_->GetModel()->Remove(node_->GetParent(),
@@ -359,7 +353,7 @@
break;
}
- case add_bookmark_id: {
+ case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: {
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Add", profile);
BookmarkEditorView::Show(view_->GetViewContainer()->GetHWND(),
@@ -367,7 +361,7 @@
break;
}
- case new_folder_id: {
+ case IDS_BOOMARK_BAR_NEW_FOLDER: {
UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_NewFolder",
profile);
@@ -382,7 +376,7 @@
break;
}
- case always_show_command_id:
+ case IDS_BOOMARK_BAR_ALWAYS_SHOW:
view_->ToggleWhenVisible();
break;
@@ -392,14 +386,22 @@
}
bool BookmarkBarContextMenuController::IsItemChecked(int id) const {
- DCHECK(id == always_show_command_id);
+ DCHECK(id == IDS_BOOMARK_BAR_ALWAYS_SHOW);
return view_->GetProfile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
}
bool BookmarkBarContextMenuController::IsCommandEnabled(int id) const {
- if (id == open_all_bookmarks_id || id == open_all_bookmarks_in_new_window_id)
- return NodeHasURLs(node_);
+ switch (id) {
+ case IDS_BOOMARK_BAR_OPEN_INCOGNITO:
+ return !view_->GetProfile()->IsOffTheRecord();
+ case IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO:
+ return NodeHasURLs(node_) && !view_->GetProfile()->IsOffTheRecord();
+
+ case IDS_BOOMARK_BAR_OPEN_ALL:
+ case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW:
+ return NodeHasURLs(node_);
+ }
return true;
}
« chrome/app/generated_resources.grd ('K') | « chrome/browser/bookmark_bar_context_menu_controller.h ('k') | chrome/browser/bookmark_bar_context_menu_controller_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698