Bunch of match preview tweaks:

chrome/browser/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 25 matching lines @@
 #include "chrome/browser/tab_contents/match_preview.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/accessible_view_helper.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/frame/browser_view_layout.h"
+#include "chrome/browser/views/frame/contents_container.h"
 #include "chrome/browser/views/fullscreen_exit_bubble.h"
 #include "chrome/browser/views/status_bubble_views.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/theme_install_bubble_view.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/browser/views/update_recommended_message_box.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/browser/wrench_menu_model.h"
@@ skipping 72 matching lines @@
         profile ? profile : browser->profile(),
         Browser::TYPE_NORMAL, true);
     if (normal_browser && normal_browser->window())
       return normal_browser->window()->GetNativeHandle();
   }
 
   return browser->window()->GetNativeHandle();
 }
 #endif  // defined(OS_CHROMEOS)
 
-// ContentsContainer is responsible for managing the TabContents views.
-// ContentsContainer has up to two children: one for the currently active
-// TabContents and one for the match preview TabContents.
-class BrowserView::ContentsContainer : public views::View {
- public:
-  ContentsContainer(BrowserView* browser_view, views::View* active)
-      : browser_view_(browser_view),
-        active_(active),
-        preview_(NULL) {
-    AddChildView(active_);
-  }
-
-  // Makes the preview view the active view and nulls out the old active view.
-  // It's assumed the caller will delete or remove the old active view
-  // separately.
-  void MakePreviewContentsActiveContents() {
-    active_ = preview_;
-    preview_ = NULL;
-    Layout();
-  }
-
-  // Sets the preview view. This does not delete the old.
-  void SetPreview(views::View* preview) {
-    if (preview == preview_)
-      return;
-
-    if (preview_)
-      RemoveChildView(preview_);
-    preview_ = preview;
-    if (preview_)
-      AddChildView(preview_);
-
-    Layout();
-  }
-
-  virtual void Layout() {
-    // The active view always gets the full bounds.
-    active_->SetBounds(0, 0, width(), height());
-
-    if (preview_) {
-      // The preview view gets the full width and is positioned beneath the
-      // bottom of the autocompleted popup.
-      int max_autocomplete_y = browser_view_->toolbar()->location_bar()->
-          location_entry()->model()->popup_model()->view()->GetMaxYCoordinate();
-      gfx::Point screen_origin;
-      views::View::ConvertPointToScreen(this, &screen_origin);
-      DCHECK_GT(max_autocomplete_y, screen_origin.y());
-      int preview_origin = max_autocomplete_y - screen_origin.y();
-      if (preview_origin < height()) {
-        preview_->SetBounds(0, preview_origin, width(),
-                            height() - preview_origin);
-      } else {
-        preview_->SetBounds(0, 0, 0, 0);
-      }
-    }
-
-    // Need to invoke views::View in case any views whose bounds didn't change
-    // still need a layout.
-    views::View::Layout();
-  }
-
- private:
-  BrowserView* browser_view_;
-  views::View* active_;
-  views::View* preview_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentsContainer);
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 // BookmarkExtensionBackground, private:
 // This object serves as the views::Background object which is used to layout
 // and paint the bookmark bar.
 class BookmarkExtensionBackground : public views::Background {
  public:
   explicit BookmarkExtensionBackground(BrowserView* browser_view,
                                        DetachableToolbarView* host_view,
                                        Browser* browser);
 
@@ skipping 1198 matching lines @@
   ui_controls::SendKeyPress(GetNativeHandle(), app::VKEY_V,
                             false, false, false, true);
 }
 #endif
 
 void BrowserView::ToggleTabStripMode() {
   InitTabStrip(browser_->tabstrip_model());
   frame_->TabStripDisplayModeChanged();
 }
 
+void BrowserView::ShowMatchPreview() {
+  if (!preview_container_)
+    preview_container_ = new TabContentsContainer();
+  TabContents* preview_tab_contents =
+      browser_->match_preview()->preview_contents();
+  contents_->SetPreview(preview_container_, preview_tab_contents);
+  preview_container_->ChangeTabContents(preview_tab_contents);
+}
+
+void BrowserView::HideMatchPreview() {
+  if (!preview_container_)
+    return;
+
+  // The contents must be changed before SetPreview is invoked.
+  preview_container_->ChangeTabContents(NULL);
+  contents_->SetPreview(NULL, NULL);
+  delete preview_container_;
+  preview_container_ = NULL;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
   return bookmark_bar_view_.get();
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_->location_bar();
 }
@@ skipping 19 matching lines @@
                           const NotificationSource& source,
                           const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::PREF_CHANGED:
       if (*Details<std::string>(details).ptr() == prefs::kShowBookmarkBar &&
           MaybeShowBookmarkBar(browser_->GetSelectedTabContents())) {
         Layout();
       }
       break;
 
-    case NotificationType::MATCH_PREVIEW_TAB_CONTENTS_CREATED:
-      if (Source<TabContents>(source).ptr() ==
-          browser_->GetSelectedTabContents()) {
-        ShowMatchPreview();
-      }
-      break;
-
-    case NotificationType::TAB_CONTENTS_DESTROYED: {
-      if (MatchPreview::IsEnabled()) {
-        TabContents* selected_contents = browser_->GetSelectedTabContents();
-        if (selected_contents &&
-            selected_contents->match_preview()->preview_contents() ==
-            Source<TabContents>(source).ptr()) {
-          HideMatchPreview();
-        }
-      }
-      break;
-    }
-
     case NotificationType::SIDEBAR_CHANGED:
       if (Details<SidebarContainer>(details)->tab_contents() ==
           browser_->GetSelectedTabContents()) {
         UpdateSidebar();
       }
       break;
 
     default:
       NOTREACHED() << "Got a notification we didn't register for!";
       break;
@@ skipping 483 matching lines @@
 
   if (AeroPeekManager::Enabled()) {
     aeropeek_manager_.reset(new AeroPeekManager(
         frame_->GetWindow()->GetNativeWindow()));
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
 
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
-
-  registrar_.Add(this,
-                 NotificationType::MATCH_PREVIEW_TAB_CONTENTS_CREATED,
-                 NotificationService::AllSources());
-  registrar_.Add(this,
-                 NotificationType::TAB_CONTENTS_DESTROYED,
-                 NotificationService::AllSources());
 }
 
 #if defined(OS_WIN)
 void BrowserView::InitSystemMenu() {
   system_menu_contents_.reset(new views::SystemMenuModel(this));
   // We add the menu items in reverse order so that insertion_index never needs
   // to change.
   if (IsBrowserTypeNormal())
     BuildSystemMenuForBrowserWindow();
   else
@@ skipping 462 matching lines @@
     ticker_.Start();
 
     pref_service->SetInteger(prefs::kPluginMessageResponseTimeout,
                              plugin_message_response_timeout);
     pref_service->SetInteger(prefs::kHungPluginDetectFrequency,
                              hung_plugin_detect_freq);
   }
 #endif
 }
 
-void BrowserView::ShowMatchPreview() {
-  if (!preview_container_)
-    preview_container_ = new TabContentsContainer();
-  contents_->SetPreview(preview_container_);
-  preview_container_->ChangeTabContents(
-      browser_->GetSelectedTabContents()->match_preview()->preview_contents());
-}
-
-void BrowserView::HideMatchPreview() {
-  if (!preview_container_)
-    return;
-
-  // The contents must be changed before SetPreview is invoked.
-  preview_container_->ChangeTabContents(NULL);
-  contents_->SetPreview(NULL);
-  delete preview_container_;
-  preview_container_ = NULL;
-}
-
 void BrowserView::ProcessTabSelected(TabContents* new_contents,
                                      bool change_tab_contents) {
   // Update various elements that are interested in knowing the current
   // TabContents.
 
   // When we toggle the NTP floating bookmarks bar and/or the info bar,
   // we don't want any TabContents to be attached, so that we
   // avoid an unnecessary resize and re-layout of a TabContents.
   if (change_tab_contents)
     contents_container_->ChangeTabContents(NULL);
@@ skipping 34 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }