More TabStrip refactoring.

chrome/browser/chromeos/compact_location_bar_host.cc

 // 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.
 
 #include "chrome/browser/chromeos/compact_location_bar_host.h"
 
 #include <algorithm>
 
 #include "app/slide_animation.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/compact_location_bar_view.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/find_bar_view.h"
 #include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/tabs/tab.h"
-#include "chrome/browser/views/tabs/tab_strip.h"
+#include "chrome/browser/views/tabs/base_tab_strip.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 namespace chromeos {
 const int kDefaultLocationBarWidth = 300;
 const int kHideTimeoutInSeconds = 2;
 
@@ skipping 56 matching lines @@
   GdkWindow* top_level_window_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompactLocationBarHost, public:
 
 CompactLocationBarHost::CompactLocationBarHost(::BrowserView* browser_view)
     : DropdownBarHost(browser_view),
-      current_tab_index_(-1) {
+      current_tab_model_index_(-1) {
   auto_hide_timer_.reset(new base::OneShotTimer<CompactLocationBarHost>());
   mouse_observer_.reset(new MouseObserver(this, browser_view));
   Init(new CompactLocationBarView(this));
 }
 
 CompactLocationBarHost::~CompactLocationBarHost() {
   browser_view()->browser()->tabstrip_model()->RemoveObserver(this);
   MessageLoopForUI::current()->RemoveObserver(mouse_observer_.get());
 }
 
@@ skipping 16 matching lines @@
     const views::Accelerator& accelerator) {
   Hide(true);
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompactLocationBarHost, views::DropdownBarHost implementation:
 
 gfx::Rect CompactLocationBarHost::GetDialogPosition(
     gfx::Rect avoid_overlapping_rect) {
-  DCHECK_GE(current_tab_index_, 0);
-  gfx::Rect new_pos = GetBoundsUnderTab(current_tab_index_);
+  DCHECK_GE(current_tab_model_index_, 0);
+  gfx::Rect new_pos = GetBoundsUnderTab(current_tab_model_index_);
 
   if (animation_offset() > 0)
     new_pos.Offset(0, std::min(0, -animation_offset()));
   return new_pos;
 }
 
 void CompactLocationBarHost::SetDialogPosition(const gfx::Rect& new_pos,
                                                bool no_redraw) {
   if (new_pos.IsEmpty())
     return;
@@ skipping 49 matching lines @@
 void CompactLocationBarHost::TabChangedAt(TabContents* contents, int index,
                                           TabChangeType change_type) {
   if (IsCurrentTabIndex(index) && IsVisible()) {
     GetClbView()->Update(contents);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompactLocationBarHost public:
 
-gfx::Rect CompactLocationBarHost::GetBoundsUnderTab(int index) const {
+gfx::Rect CompactLocationBarHost::GetBoundsUnderTab(int model_index) const {
   // Get the position of the left-bottom corner of the tab on the
   // widget.  The widget of the tab is same as the widget of the
   // BrowserView which is the parent of the host.
-  TabStrip* tabstrip = browser_view()->tabstrip()->AsTabStrip();
-  gfx::Rect bounds = tabstrip->GetIdealBounds(index);
+  BaseTabStrip* tabstrip = browser_view()->tabstrip();
+  gfx::Rect bounds =
+      tabstrip->ideal_bounds(tabstrip->ModelIndexToTabIndex(model_index));
   gfx::Rect navbar_bounds(gfx::Point(bounds.x(), bounds.height()),
                           view()->GetPreferredSize());
 
   // For RTL case x() defines tab right corner.
   if (base::i18n::IsRTL())
     navbar_bounds.set_x(navbar_bounds.x() + bounds.width());
   navbar_bounds.set_x(navbar_bounds.x() + tabstrip->x());
   navbar_bounds.set_y(navbar_bounds.y() + tabstrip->y());
 
   // The compact location bar must be smaller than browser_width.
   int width = std::min(browser_view()->width(),
                        view()->GetPreferredSize().width());
 
   // Try to center around the tab.
   navbar_bounds.set_x(browser_view()->MirroredXCoordinateInsideView(
       navbar_bounds.x()) - ((width - bounds.width()) / 2));
 
   if (browser_view()->IsBookmarkBarVisible() &&
       !browser_view()->GetBookmarkBarView()->IsDetached()) {
     // Adjust the location to create the illusion that the compact location bar
     // is a part of boolmark bar.
     // TODO(oshima): compact location bar does not have right background
     // image yet, so -2 is tentative. Fix this once UI is settled.
     navbar_bounds.set_y(
         browser_view()->GetBookmarkBarView()->bounds().bottom() - 2);
   }
   return navbar_bounds.AdjustToFit(browser_view()->bounds());
 }
 
-void CompactLocationBarHost::Update(int index,
+void CompactLocationBarHost::Update(int model_index,
                                     bool animate_x,
                                     bool select_all) {
-  DCHECK_GE(index, 0);
-  if (IsCurrentTabIndex(index) && IsVisible()) {
+  DCHECK_GE(model_index, 0);
+  if (IsCurrentTabIndex(model_index) && IsVisible()) {
     return;
   }
-  current_tab_index_ = index;
+  current_tab_model_index_ = model_index;
   // Don't aminate if the bar is already shown.
   bool animate = !animation()->IsShowing();
   Hide(false);
   GetClbView()->Update(browser_view()->browser()->GetSelectedTabContents());
   GetClbView()->SetFocusAndSelection(select_all);
   Show(animate && animate_x);
 }
 
 void CompactLocationBarHost::CancelAutoHideTimer() {
   auto_hide_timer_->Stop();
@@ skipping 18 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompactLocationBarHost private:
 
 CompactLocationBarView* CompactLocationBarHost::GetClbView() {
   return static_cast<CompactLocationBarView*>(view());
 }
 
 bool CompactLocationBarHost::IsCurrentTabIndex(int index) {
-  return current_tab_index_ == index;
+  return current_tab_model_index_ == index;
 }
 
 }  // namespace chromeos