retry r112077 - recently closed menu: respect middle click

chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.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/webui/ntp/recently_closed_tabs_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 namespace {
 
 void TabToValue(const TabRestoreService::Tab& tab,
                 DictionaryValue* dictionary) {
   const TabNavigation& current_navigation =
       tab.navigations.at(tab.current_navigation_index);
   NewTabUI::SetURLTitleAndDirection(dictionary, current_navigation.title(),
@@ skipping 34 matching lines @@
     tab_restore_service_->RemoveObserver(this);
 }
 
 void RecentlyClosedTabsHandler::HandleReopenTab(const ListValue* args) {
   TabRestoreServiceDelegate* delegate =
       TabRestoreServiceDelegate::FindDelegateForController(
       &web_ui_->tab_contents()->controller(), NULL);
   if (!delegate || !tab_restore_service_)
     return;
 
-  int session_to_restore;
-  if (!ExtractIntegerValue(args, &session_to_restore))
-    return;
+  double index = -1.0;
+  CHECK(args->GetDouble(1, &index));
 
-  const TabRestoreService::Entries& entries = tab_restore_service_->entries();
-  int index = 0;
-  for (TabRestoreService::Entries::const_iterator iter = entries.begin();
-       iter != entries.end(); ++iter, ++index) {
-    if (session_to_restore == (*iter)->id)
-      break;
-  }
   // There are actually less than 20 restore tab items displayed in the UI.
-  UMA_HISTOGRAM_ENUMERATION("NewTabPage.SessionRestore", index, 20);
+  UMA_HISTOGRAM_ENUMERATION("NewTabPage.SessionRestore",
+                            static_cast<int>(index), 20);
 
-  tab_restore_service_->RestoreEntryById(delegate, session_to_restore, true);
+  double session_to_restore = 0.0;
+  CHECK(args->GetDouble(0, &session_to_restore));
+
+  WindowOpenDisposition disposition =
+      web_ui_util::GetDispositionFromClick(args, 2);
+  tab_restore_service_->RestoreEntryById(delegate,
+                                         static_cast<int>(session_to_restore),
+                                         disposition);
   // The current tab has been nuked at this point; don't touch any member
   // variables.
 }
 
 void RecentlyClosedTabsHandler::HandleGetRecentlyClosedTabs(
     const ListValue* args) {
   if (!tab_restore_service_) {
     tab_restore_service_ =
         TabRestoreServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_));
 
@@ skipping 45 matching lines @@
       DCHECK_EQ(entry->type, TabRestoreService::WINDOW);
       WindowToValue(*static_cast<TabRestoreService::Window*>(entry),
                     entry_dict.get());
     }
 
     entry_dict->SetInteger("sessionId", entry->id);
     entry_list_value->Append(entry_dict.release());
     added_count++;
   }
 }