Bunch of match preview tweaks:

chrome/browser/views/frame/browser_view.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_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 25 matching lines @@
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
 
 class AccessibleToolbarView;
 class AccessibleViewHelper;
 class BookmarkBarView;
 class Browser;
 class BrowserBubble;
 class BrowserViewLayout;
+class ContentsContainer;
 class DownloadShelfView;
 class EncodingMenuModel;
 class FullscreenExitBubble;
 class HtmlDialogUIDelegate;
 class InfoBarContainer;
 class LocationBarView;
 class SideTabStrip;
 class StatusBubbleViews;
 class TabContentsContainer;
 class ToolbarView;
@@ skipping 256 matching lines @@
                             bool show_history);
   virtual void ShowAppMenu();
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
   virtual void Cut();
   virtual void Copy();
   virtual void Paste();
   virtual void ToggleTabStripMode();
+  virtual void ShowMatchPreview();
+  virtual void HideMatchPreview();
 
   // Overridden from BrowserWindowTesting:
   virtual BookmarkBarView* GetBookmarkBarView() const;
   virtual LocationBarView* GetLocationBarView() const;
   virtual views::View* GetTabContentsContainerView() const;
   virtual views::View* GetSidebarContainerView() const;
   virtual ToolbarView* GetToolbarView() const;
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
@@ skipping 81 matching lines @@
   // multiple times over the life of the browser, and is run when the display
   // mode for the tabstrip changes from horizontal to vertical.
   virtual void InitTabStrip(TabStripModel* tab_strip_model);
 
   // Browser window related initializations.
   virtual void Init();
 
  private:
   friend class BrowserViewLayout;
 
-  class ContentsContainer;
-
 #if defined(OS_WIN)
   // Creates the system menu.
   void InitSystemMenu();
 #endif
 
   // Returns the BrowserViewLayout.
   BrowserViewLayout* GetBrowserViewLayout() const;
 
   // Layout the Status Bubble.
   void LayoutStatusBubble(int top);
@@ skipping 51 matching lines @@
 
   // Retrieves the command id for the specified Windows app command.
   int GetCommandIDForAppCommandID(int app_command_id) const;
 
   // Callback for the loading animation(s) associated with this view.
   void LoadingAnimationCallback();
 
   // Initialize the hung plugin detector.
   void InitHangMonitor();
 
-  // Shows the match preview for the selected tab contents.
-  void ShowMatchPreview();
-
-  // Hides the match preview for the selected tab contents.
-  void HideMatchPreview();
-
   // Invoked from TabSelectedAt or when the match preview is made active.  Is
   // |change_tab_contents| is true, |new_contents| is added to the view
   // hierarchy, if |change_tab_contents| is false, it's assumed |new_contents|
   // has already been added to the view hierarchy.
   void ProcessTabSelected(TabContents* new_contents, bool change_tab_contents);
 
   // Last focused view that issued a tab traversal.
   int last_focused_view_storage_id_;
 
   // The BrowserFrame that hosts this view.
   BrowserFrame* frame_;
 
   // The Browser object we are associated with.
   scoped_ptr<Browser> browser_;
 
   // BrowserView layout (LTR one is pictured here).
   //
   // --------------------------------------------------------------------------
   // |         | Tabs (1)                                                     |
   // |         |--------------------------------------------------------------|
   // |         | Navigation buttons, menus and the address bar (toolbar_)     |
   // |         |--------------------------------------------------------------|
-  // |         | All infobars (infobar_container_)                            |
+  // |         | All infobars (infobar_container_) *                          |
   // |         |--------------------------------------------------------------|
-  // |         | Bookmarks (bookmark_bar_view_)                               |
+  // |         | Bookmarks (bookmark_bar_view_) *                             |
   // |         |--------------------------------------------------------------|
   // |         |Page content (contents_)              ||                      |
   // |         |--------------------------------------|| Sidebar content      |
-  // |         || contents_container_ or             ||| (sidebar_container_) |
+  // |         || contents_container_ and/or         ||| (sidebar_container_) |
   // |         || preview_container_                 |||                      |
   // |         ||                                    |(3)                     |
   // | Tabs (2)||                                    |||                      |
   // |         ||                                    |||                      |
   // |         ||                                    |||                      |
   // |         ||                                    |||                      |
   // |         |--------------------------------------||                      |
   // |         |==(4)=========================================================|
   // |         |                                                              |
   // |         |                                                              |
   // |         | Debugger (devtools_container_)                               |
   // |         |                                                              |
   // |         |                                                              |
   // |         |--------------------------------------------------------------|
   // |         | Active downloads (download_shelf_)                           |
   // --------------------------------------------------------------------------
   //
   // (1) - tabstrip_, default position
   // (2) - tabstrip_, position when side tabs are enabled
   // (3) - sidebar_split_
   // (4) - contents_split_
+  //
+  // * - The bookmark bar and info bar are swapped when on the new tab page.
+  //     Additionally contents_ is positioned on top of the bookmark bar when
+  //     the bookmark bar is detached. This is done to allow the
+  //     preview_container_ to appear over the bookmark bar.
 
   // Tool/Info bars that we are currently showing. Used for layout.
   // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
   // or is bookmark_bar_view_ if the bookmark bar is showing.
   views::View* active_bookmark_bar_;
 
   // The TabStrip.
   BaseTabStrip* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
@@ skipping 83 matching lines @@
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   scoped_ptr<AccessibleViewHelper> accessible_view_helper_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_