Makes the following changes to the bookmark bar context menu:...

chrome/browser/bookmark_bar_context_menu_controller.cc

 // Copyright (c) 2006-2008 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/bookmark_bar_context_menu_controller.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/page_navigator.h"
@@ skipping 175 matching lines @@
   bool is_new_;
   ChromeViews::Window* window_;
 
   DISALLOW_EVIL_CONSTRUCTORS(EditFolderController);
 };
 
 }  // namespace
 
 // 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,
     PageNavigator* navigator,
     BookmarkNode* node,
     WindowOpenDisposition initial_disposition) {
   if (!ShouldOpenAll(parent, node))
     return;
 
   PageNavigator* nav = navigator;
   bool opened_url = false;
   OpenAllImpl(node, initial_disposition, &nav, &opened_url);
 }
 
 BookmarkBarContextMenuController::BookmarkBarContextMenuController(
     BookmarkBarView* view,
     BookmarkNode* node)
     : view_(view),
       node_(node),
       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);
 }
 
 void BookmarkBarContextMenuController::RunMenuAt(int x, int y) {
   // Record the current ModelChangedListener. It will be non-null when we're
   // used as the context menu for another menu.
   ModelChangedListener* last_listener = view_->GetModelChangedListener();
 
   view_->SetModelChangedListener(this);
 
   // width/height don't matter here.
   menu_.RunMenuAt(view_->GetViewContainer()->GetHWND(), gfx::Rect(x, y, 0, 0),
                   ChromeViews::MenuItemView::TOPLEFT, true);
 
   if (view_->GetModelChangedListener() == this)
     view_->SetModelChangedListener(last_listener);
 }
 
 void BookmarkBarContextMenuController::ModelChanged() {
   menu_.Cancel();
 }
 
 void BookmarkBarContextMenuController::ExecuteCommand(int id) {
   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);
 
       view_->GetPageNavigator()->OpenURL(node_->GetURL(), NEW_WINDOW,
                                          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);
 
       view_->GetPageNavigator()->OpenURL(node_->GetURL(), NEW_FOREGROUND_TAB,
                                          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 {
+      } 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_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;
 
       OpenAll(parent_hwnd, view_->GetPageNavigator(), node_,
               initial_disposition);
       break;
     }
 
-    case edit_bookmark_id:
+    case IDS_BOOKMARK_BAR_EDIT:
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Edit", profile);
 
       if (node_->GetType() == history::StarredEntry::URL) {
         BookmarkEditorView::Show(view_->GetViewContainer()->GetHWND(),
                                  view_->GetProfile(), NULL, node_);
       } else {
         // Controller deletes itself when done.
         EditFolderController* controller = new EditFolderController(
             view_, node_, -1, false);
         controller->Show();
       }
       break;
 
-    case delete_bookmark_id: {
+    case IDS_BOOKMARK_BAR_REMOVE: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Remove", profile);
 
       view_->GetModel()->Remove(node_->GetParent(),
                                 node_->GetParent()->IndexOfChild(node_));
       break;
     }
 
-    case add_bookmark_id: {
+    case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_Add", profile);
 
       BookmarkEditorView::Show(view_->GetViewContainer()->GetHWND(),
                                view_->GetProfile(), node_, NULL);
       break;
     }
 
-    case new_folder_id: {
+    case IDS_BOOMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(L"BookmarkBar_ContextMenu_NewFolder",
                                 profile);
 
       int visual_order;
       BookmarkNode* parent =
           GetParentAndVisualOrderForNewNode(&visual_order);
       GetParentAndVisualOrderForNewNode(&visual_order);
       // Controller deletes itself when done.
       EditFolderController* controller =
           new EditFolderController(view_, parent, visual_order, true);
       controller->Show();
       break;
     }
 
-    case always_show_command_id:
+    case IDS_BOOMARK_BAR_ALWAYS_SHOW:
       view_->ToggleWhenVisible();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 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;
 }
 
 // Returns the parent node and visual_order to use when adding new
 // bookmarks/folders.
 BookmarkNode* BookmarkBarContextMenuController::
     GetParentAndVisualOrderForNewNode(int* visual_order) {
   if (node_->GetType() != history::StarredEntry::URL) {
     // Adding to a group always adds to the end.
     *visual_order = node_->GetChildCount();
     return node_;
   } else {
     DCHECK(node_->GetParent());
     *visual_order = node_->GetParent()->IndexOfChild(node_) + 1;
     return node_->GetParent();
   }
 }