Reverting 14948.

chrome/browser/tabs/tab_strip_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_
 #define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
@@ skipping 91 matching lines @@
 //  This interface is typically implemented by the controller that instantiates
 //  the TabStripModel (in our case the Browser object).
 //
 ///////////////////////////////////////////////////////////////////////////////
 class TabStripModelDelegate {
  public:
   // Adds what the delegate considers to be a blank tab to the model.
   virtual TabContents* AddBlankTab(bool foreground) = 0;
   virtual TabContents* AddBlankTabAt(int index, bool foreground) = 0;
 
-  // Asks for a new TabStripModel to be created and the given tab contents to
+  // Ask for a new TabStripModel to be created and the given tab contents to
   // be added to it. Its size and position are reflected in |window_bounds|.
   // If |dock_info|'s type is other than NONE, the newly created window should
   // be docked as identified by |dock_info|. Returns the Browser object
   // representing the newly created window and tab strip. This does not
   // show the window, it's up to the caller to do so.
   // TODO(pinkerton): I really don't like the fact that this is returning a
   // Browser object, there may be some better abstraction we can achieve that
   // the Browser implements, but for now, we'll experiment with returning
   // that type.
   virtual Browser* CreateNewStripWithContents(TabContents* contents,
                                               const gfx::Rect& window_bounds,
                                               const DockInfo& dock_info) = 0;
 
   enum {
     TAB_MOVE_ACTION = 1,
     TAB_TEAROFF_ACTION = 2
   };
 
-  // Determines what drag actions are possible for the specified strip.
+  // Determine what drag actions are possible for the specified strip.
   virtual int GetDragActions() const = 0;
 
   // Creates an appropriate TabContents for the given URL. This is handled by
   // the delegate since the TabContents may require special circumstances to
   // exist for it to be constructed (e.g. a parent HWND).
   // If |defer_load| is true, the navigation controller doesn't load the url.
   // If |instance| is not null, its process is used to render the tab.
   virtual TabContents* CreateTabContentsForURL(
       const GURL& url,
       const GURL& referrer,
       Profile* profile,
       PageTransition::Type transition,
       bool defer_load,
       SiteInstance* instance) const = 0;
 
-  // Returns whether some contents can be duplicated.
+  // Return whether some contents can be duplicated.
   virtual bool CanDuplicateContentsAt(int index) = 0;
 
-  // Duplicates the contents at the provided index and places it into its own
+  // Duplicate the contents at the provided index and places it into its own
   // window.
   virtual void DuplicateContentsAt(int index) = 0;
 
   // Called when a drag session has completed and the frame that initiated the
   // the session should be closed.
   virtual void CloseFrameAfterDragSession() = 0;
 
   // Creates an entry in the historical tab database for the specified
   // TabContents.
   virtual void CreateHistoricalTab(TabContents* contents) = 0;
 
   // Runs any unload listeners associated with the specified TabContents before
   // it is closed. If there are unload listeners that need to be run, this
   // function returns true and the TabStripModel will wait before closing the
   // TabContents. If it returns false, there are no unload listeners and the
   // TabStripModel can close the TabContents immediately.
   virtual bool RunUnloadListenerBeforeClosing(TabContents* contents) = 0;
 
   // Returns true if a tab can be restored.
   virtual bool CanRestoreTab() = 0;
 
   // Restores the last closed tab if CanRestoreTab would return true.
   virtual void RestoreTab() = 0;
-
-  // Returns whether some contents can be closed.
-  virtual bool CanCloseContentsAt(int index) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // TabStripModel
 //
 //  A model & low level controller of a Browser Window tabstrip. Holds a vector
 //  of TabContents, and provides an API for adding, removing and shuffling
 //  them, as well as a higher level API for doing specific Browser-related
 //  tasks like adding new Tabs from just a URL, etc.
@@ skipping 63 matching lines @@
   // |inherit_group| is true, the new contents is linked to the current tab's
   // group.
   void InsertTabContentsAt(int index,
                            TabContents* contents,
                            bool foreground,
                            bool inherit_group);
 
   // Closes the TabContents at the specified index. This causes the TabContents
   // to be destroyed, but it may not happen immediately (e.g. if it's a
   // WebContents).
-  // Returns true if the TabContents was closed immediately, false if it was not
-  // closed (we may be waiting for a response from an onunload handler, or
-  // waiting for the user to confirm closure).
+  // Returns true if the TabContents was closed immediately, false if we are
+  // waiting for a response from an onunload handler.
   bool CloseTabContentsAt(int index) {
     return InternalCloseTabContentsAt(index, true);
   }
 
   // Replaces the entire state of a the tab at index by switching in a
   // different NavigationController. This is used through the recently
   // closed tabs list, which needs to replace a tab's current state
   // and history with another set of contents and history.
   //
   // The old NavigationController is deallocated and this object takes
@@ skipping 291 matching lines @@
   typedef ObserverList<TabStripModelObserver> TabStripModelObservers;
   TabStripModelObservers observers_;
 
   // A scoped container for notification registries.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStripModel);
 };
 
 #endif  // CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_