More TabStrip refactoring.

chrome/browser/chromeos/compact_location_bar_host.h

 // Copyright (c) 2010 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_CHROMEOS_COMPACT_LOCATION_BAR_HOST_H_
 #define CHROME_BROWSER_CHROMEOS_COMPACT_LOCATION_BAR_HOST_H_
 
 #include "app/animation.h"
 #include "base/timer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ skipping 25 matching lines @@
 // when the compact navigation bar is toggled.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class CompactLocationBarHost : public DropdownBarHost,
                                public TabStripModelObserver {
  public:
   explicit CompactLocationBarHost(::BrowserView* browser_view);
   virtual ~CompactLocationBarHost();
 
   // Returns the bounds to locale the compact location bar under the tab.
-  gfx::Rect GetBoundsUnderTab(int tab_index) const;
+  gfx::Rect GetBoundsUnderTab(int model_index) const;
 
   // Updates the content and the position of the compact location bar.
-  // |index| is the index of the tab the compact location bar
+  // |model_index| is the index of the tab the compact location bar
   // will be attached to and |animate| specifies if the location bar
   // should animate when shown.
-  void Update(int index, bool animate, bool select_all);
+  void Update(int model_index, bool animate, bool select_all);
 
   // (Re)Starts the popup timer that hides the popup after X seconds.
   void StartAutoHideTimer();
 
   // Cancels the popup timer.
   void CancelAutoHideTimer();
 
   // Enable/disable the compact location bar.
   void SetEnabled(bool enabled);
 
@@ skipping 29 matching lines @@
 
   void HideCallback() {
     Hide(true);
   }
 
   // Returns CompactLocationBarView.
   CompactLocationBarView* GetClbView();
 
   bool IsCurrentTabIndex(int index);
 
-  // The index of the tab that the compact location bar is attached to.
-  int current_tab_index_;
+  // The index of the tab, in terms of the model, that the compact location bar
+  // is attached to.
+  int current_tab_model_index_;
 
   scoped_ptr<base::OneShotTimer<CompactLocationBarHost> > auto_hide_timer_;
 
   scoped_ptr<MouseObserver> mouse_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CompactLocationBarHost);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_COMPACT_LOCATION_BAR_HOST_H_