added CTRL+Click and SHIFT+Click handler for context menu, Back and Forward.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1159 matching lines @@
                                              from_last_session);
 
   tab_handler_->GetTabStripModel()->ReplaceNavigationControllerAt(
       tab_handler_->GetTabStripModel()->active_index(),
       wrapper);
 }
 
 bool Browser::CanRestoreTab() {
   return command_updater_.IsCommandEnabled(IDC_RESTORE_TAB);
 }
 

[Ben Goodger (Google), 2011/05/31 16:00:00]

I am beginning to feel like all of this code should move to browser_navigator.

I wouldn't add it to Navigate() since these methods are too specialized, but
they can move to the file, and you can add unit tests for all of this in
browser_navigator_browsertest

[shinyak (Google), 2011/06/09 02:29:04]

I leave it as is now. I would like to do refactoring in another patch.

On 2011/05/31 16:00:00, Ben Goodger wrote:

 bool Browser::NavigateToIndexWithDisposition(int index,
                                              WindowOpenDisposition disp) {
-  NavigationController& controller =
-      GetOrCloneTabForDisposition(disp)->controller();
+  TabContentsWrapper* tab = GetOrCloneTabWrapperForDisposition(disp);
+
+  NavigationController& controller = tab->controller();
   if (index < 0 || index >= controller.entry_count())
     return false;
   controller.GoToIndex(index);
+
+  CreateNewBrowserForDisposition(tab, disp);
+
   return true;
 }
 
 browser::NavigateParams Browser::GetSingletonTabNavigateParams(
     const GURL& url) {
   browser::NavigateParams params(this, url, PageTransition::AUTO_BOOKMARK);
   params.disposition = SINGLETON_TAB;
   params.window_action = browser::NavigateParams::SHOW_WINDOW;
   params.user_gesture = true;
   return params;
@@ skipping 52 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_TOGGLE_VERTICAL_TABS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, show_main_ui);
 #if defined (ENABLE_PROFILING) && !defined(NO_TCMALLOC)
   command_updater_.UpdateCommandEnabled(IDC_PROFILING_ENABLED, show_main_ui);
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted browser commands:
 
-bool Browser::ShouldOpenNewTabForWindowDisposition(
+bool Browser::ShouldOpenNewTabForDisposition(
     WindowOpenDisposition disposition) {
   return (disposition == NEW_FOREGROUND_TAB ||
           disposition == NEW_BACKGROUND_TAB);
 }
 
 TabContents* Browser::GetOrCloneTabForDisposition(
        WindowOpenDisposition disposition) {
+  return GetOrCloneTabWrapperForDisposition(disposition)->tab_contents();
+}
+
+TabContentsWrapper* Browser::GetOrCloneTabWrapperForDisposition(
+    WindowOpenDisposition disposition)

[Ben Goodger (Google), 2011/05/31 16:00:00]

nit: curly-brace at the end of this line, not the next one

[shinyak (Google), 2011/06/09 02:29:04]

Done.

+{
   TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
-  if (ShouldOpenNewTabForWindowDisposition(disposition)) {
-    current_tab = current_tab->Clone();
+
+  if (disposition == NEW_WINDOW)
+    return current_tab->Clone();
+
+  if (ShouldOpenNewTabForDisposition(disposition)) {
+    TabContentsWrapper* new_tab = current_tab->Clone();
     tab_handler_->GetTabStripModel()->AddTabContents(
-        current_tab, -1, PageTransition::LINK,
+        new_tab, -1, PageTransition::LINK,
         disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_ACTIVE :
                                             TabStripModel::ADD_NONE);
+    return new_tab;
   }
-  return current_tab->tab_contents();
+
+  return current_tab;
+}
+
+void Browser::CreateNewBrowserForDisposition(TabContentsWrapper* tab_contents,
+                                             WindowOpenDisposition disposition)
+{

[Ben Goodger (Google), 2011/05/31 16:00:00]

curly brace to previous line

[shinyak (Google), 2011/06/09 02:29:04]

Done.

+  if (disposition == NEW_WINDOW) {
+    Browser* browser = Create(profile_);
+    browser->AddTab(tab_contents, PageTransition::LINK);
+    browser->window()->Show();
+  }
 }
 
 void Browser::UpdateTabStripModelInsertionPolicy() {
   tab_handler_->GetTabStripModel()->SetInsertionPolicy(UseVerticalTabs() ?
       TabStripModel::INSERT_BEFORE : TabStripModel::INSERT_AFTER);
 }
 
 void Browser::UseVerticalTabsChanged() {
   UpdateTabStripModelInsertionPolicy();
   window()->ToggleTabStripMode();
@@ skipping 46 matching lines @@
   bool can_close = !watcher || watcher->CanCloseBrowser(this);
   if (!can_close && is_attempting_to_close_browser_)
     CancelWindowClose();
   return can_close;
 }
 
 void Browser::GoBack(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(UserMetricsAction("Back"));
 
   TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
-  if (current_tab->controller().CanGoBack()) {
-    TabContents* new_tab = GetOrCloneTabForDisposition(disposition);
-    // If we are on an interstitial page and clone the tab, it won't be copied
-    // to the new tab, so we don't need to go back.
-    if (current_tab->tab_contents()->showing_interstitial_page() &&
-        (new_tab != current_tab->tab_contents()))
-      return;
-    new_tab->controller().GoBack();
-  }
+  if (!current_tab->controller().CanGoBack())
+    return;
+
+  TabContentsWrapper* new_tab = GetOrCloneTabWrapperForDisposition(disposition);
+  if (current_tab->tab_contents()->showing_interstitial_page() &&
+      (new_tab != current_tab))
+    return;
+
+  new_tab->controller().GoBack();
+
+  CreateNewBrowserForDisposition(new_tab, disposition);
 }
 
 void Browser::GoForward(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(UserMetricsAction("Forward"));
-  if (GetSelectedTabContentsWrapper()->controller().CanGoForward())
-    GetOrCloneTabForDisposition(disposition)->controller().GoForward();
+
+  TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
+  if (!current_tab->controller().CanGoForward())
+    return;
+
+  TabContentsWrapper* new_tab = GetOrCloneTabWrapperForDisposition(disposition);
+  new_tab->controller().GoForward();
+
+  CreateNewBrowserForDisposition(new_tab, disposition);
 }
 
 void Browser::Reload(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(UserMetricsAction("Reload"));
   ReloadInternal(disposition, false);
 }
 
 void Browser::ReloadIgnoringCache(WindowOpenDisposition disposition) {
   UserMetrics::RecordAction(UserMetricsAction("ReloadIgnoringCache"));
   ReloadInternal(disposition, true);
@@ skipping 3274 matching lines @@
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     content_restrictions = current_tab->content_restrictions();
     NavigationEntry* active_entry = current_tab->controller().GetActiveEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
     if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL()))
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
   }
   return content_restrictions;
 }