retry r112077 - recently closed menu: respect middle click

chrome/browser/sessions/tab_restore_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <set>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
+#include "webkit/glue/window_open_disposition.h"
 
 class NavigationController;
 class Profile;
 class TabRestoreServiceDelegate;
 class TabRestoreServiceObserver;
 struct SessionWindow;
 
 // TabRestoreService is responsible for maintaining the most recently closed
 // tabs and windows. When a tab is closed
 // TabRestoreService::CreateHistoricalTab is invoked and a Tab is created to
@@ skipping 116 matching lines @@
   // Returns the entries, ordered with most recently closed entries at the
   // front.
   virtual const Entries& entries() const;
 
   // Restores the most recently closed entry. Does nothing if there are no
   // entries to restore. If the most recently restored entry is a tab, it is
   // added to |delegate|.
   void RestoreMostRecentEntry(TabRestoreServiceDelegate* delegate);
 
   // Restores an entry by id. If there is no entry with an id matching |id|,
-  // this does nothing. If |replace_existing_tab| is true and id identifies a
-  // tab, the newly created tab replaces the selected tab in |delegate|. If
-  // |delegate| is NULL, this creates a new window for the entry.
+  // this does nothing. If |delegate| is NULL, this creates a new window for the
+  // entry. |disposition| is respected, but the attributes (tabstrip index,
+  // browser window) of the tab when it was closed will be respected if
+  // disposition is UNKNOWN.
   void RestoreEntryById(TabRestoreServiceDelegate* delegate,
                         SessionID::id_type id,
-                        bool replace_existing_tab);
+                        WindowOpenDisposition disposition);
 
   // Loads the tabs and previous session. This does nothing if the tabs
   // from the previous session have already been loaded.
   void LoadTabsFromLastSession();
 
   // Max number of entries we'll keep around.
   static const size_t kMaxEntries;
 
   // Creates and add entries to |entries| for each of the windows in |windows|.
   void CreateEntriesFromWindows(std::vector<SessionWindow*>* windows,
@@ skipping 84 matching lines @@
   void OnGotLastSessionCommands(
       Handle handle,
       scoped_refptr<InternalGetCommandsRequest> request);
 
   // Populates |loaded_entries| with Entries from |request|.
   void CreateEntriesFromCommands(
       scoped_refptr<InternalGetCommandsRequest> request,
       std::vector<Entry*>* loaded_entries);
 
   // This is a helper function for RestoreEntryById() for restoring a single
-  // tab. If |replace_existing_tab| is true, the newly created tab replaces the
-  // selected tab in |delegate|. If |delegate| is NULL, this creates a new
-  // window for the entry. This returns the TabRestoreServiceDelegate into which
-  // the tab was restored.
+  // tab. If |delegate| is NULL, this creates a new window for the entry. This
+  // returns the TabRestoreServiceDelegate into which the tab was restored.
+  // |disposition| will be respected, but if it is UNKNOWN then the tab's
+  // original attributes will be respected instead.
   TabRestoreServiceDelegate* RestoreTab(const Tab& tab,
                                         TabRestoreServiceDelegate* delegate,
-                                        bool replace_existing_tab);
+                                        WindowOpenDisposition disposition);
 
   // Returns true if |tab| has more than one navigation. If |tab| has more
   // than one navigation |tab->current_navigation_index| is constrained based
   // on the number of navigations.
   static bool ValidateTab(Tab* tab);
 
   // Validates all the tabs in a window, plus the window's active tab index.
   static bool ValidateWindow(Window* window);
 
   // Calls either ValidateTab or ValidateWindow as appropriate.
@@ skipping 72 matching lines @@
   // loading LoadStateChanged is invoked, which adds these entries to
   // entries_.
   std::vector<Entry*> staging_entries_;
 
   TimeFactory* time_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TabRestoreService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_H_