Rip Out the Sidebar API

chrome/browser/ui/views/frame/browser_view.h

 // Copyright (c) 2011 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_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/views/tabs/abstract_tab_strip_view.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "content/public/browser/notification_registrar.h"

[Aaron Boodman, 2011/12/21 08:38:20]

This can go.

 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/single_split_view_listener.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #include "ui/views/controls/menu/native_menu_win.h"
@@ skipping 38 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView
 //
 //  A ClientView subclass that provides the contents of a browser window,
 //  including the TabStrip, toolbars, download shelves, the content area etc.
 //
 class BrowserView : public BrowserWindow,
                     public BrowserWindowTesting,
-                    public content::NotificationObserver,
                     public TabStripModelObserver,
                     public ui::SimpleMenuModel::Delegate,
                     public views::WidgetDelegate,
                     public views::Widget::Observer,
                     public views::ClientView,
                     public InfoBarContainer::Delegate,
                     public views::SingleSplitViewListener {
  public:
   // The browser view's class name.
   static const char kViewClassName[];
@@ skipping 40 matching lines @@
   // Returns the preferred height of the TabStrip. Used to position the OTR
   // avatar icon.
   virtual int GetTabStripHeight() const;
 
   // Takes some view's origin (relative to this BrowserView) and offsets it such
   // that it can be used as the source origin for seamlessly tiling the toolbar
   // background image over that view.
   gfx::Point OffsetPointForToolbarBackgroundImage(
       const gfx::Point& point) const;
 
-  // Returns the width of the currently displayed sidebar or 0.
-  int GetSidebarWidth() const;
-
   // Accessor for the TabStrip.
   AbstractTabStripView* tabstrip() const { return tabstrip_; }
 
   // Accessor for the Toolbar.
   ToolbarView* toolbar() const { return toolbar_; }
 
   // Returns true if various window components are visible.
   virtual bool IsTabStripVisible() const;
 
   // Returns true if the profile associated with this Browser window is
@@ skipping 181 matching lines @@
   virtual void ShowKeyboardOverlay(gfx::NativeWindow owning_window) OVERRIDE;
 #endif
   virtual void ShowAvatarBubble(TabContents* tab_contents,
                                 const gfx::Rect& rect) OVERRIDE;
   virtual void ShowAvatarBubbleFromAvatarButton() OVERRIDE;
 
   // Overridden from BrowserWindowTesting:
   virtual BookmarkBarView* GetBookmarkBarView() const OVERRIDE;
   virtual LocationBarView* GetLocationBarView() const OVERRIDE;
   virtual views::View* GetTabContentsContainerView() const OVERRIDE;
-  virtual views::View* GetSidebarContainerView() const OVERRIDE;
   virtual ToolbarView* GetToolbarView() const OVERRIDE;
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // Overridden from TabStripModelObserver:
   virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE;
   virtual void TabDeactivated(TabContentsWrapper* contents) OVERRIDE;
   virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
                                 TabContentsWrapper* new_contents,
                                 int index,
                                 bool user_gesture) OVERRIDE;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              TabContentsWrapper* old_contents,
                              TabContentsWrapper* new_contents,
@@ skipping 126 matching lines @@
   // Browser type) and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowBookmarkBar(TabContentsWrapper* contents);
 
   // Prepare to show an Info Bar for the specified TabContents. Returns true
   // if there is an Info Bar to show and one is supported for this Browser
   // type, and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowInfoBar(TabContentsWrapper* contents);
 
-  // Updates sidebar UI according to the current tab and sidebar state.
-  void UpdateSidebar();
-  // Displays active sidebar linked to the |tab_contents| or hides sidebar UI,
-  // if there's no such sidebar.
-  void UpdateSidebarForContents(TabContentsWrapper* tab_contents);
-
   // Updated devtools window for given contents.
   void UpdateDevToolsForContents(TabContentsWrapper* tab_contents);
 
   // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the
   // Download Shelf in response to a change notification from the specified
   // |contents|. |contents| can be NULL. In this case, all optional UI will be
   // removed.
   void UpdateUIForContents(TabContentsWrapper* contents);
 
   // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download
@@ skipping 67 matching lines @@
   //
   // ----------------------------------------------------------------
   // | Tabs (1)                                                     |
   // |--------------------------------------------------------------|
   // | Navigation buttons, menus and the address bar (toolbar_)     |
   // |--------------------------------------------------------------|
   // | All infobars (infobar_container_) *                          |
   // |--------------------------------------------------------------|
   // | Bookmarks (bookmark_bar_view_) *                             |
   // |--------------------------------------------------------------|
-  // |Page content (contents_)              ||                      |
-  // |--------------------------------------|| Sidebar content      |
-  // || contents_container_ and/or         ||| (sidebar_container_) |
-  // || preview_container_                 |||                      |
-  // ||                                    |(2)                     |
-  // ||                                    |||                      |
-  // ||                                    |||                      |
-  // ||                                    |||                      |
-  // ||                                    |||                      |
-  // |--------------------------------------||                      |
-  // |==(3)=========================================================|
+  // |Page content (contents_)                                     ||

[Devlin, 2011/12/21 02:11:27]

I think this is the proper new layout, but would appreciate confirmation.

+  // |-------------------------------------------------------------||
+  // || contents_container_ and/or                                |||
+  // || preview_container_                                        |||
+  // ||                                                           |||
+  // ||                                                           |||
+  // ||                                                           |||
+  // ||                                                           |||
+  // ||                                                           |||
+  // |-------------------------------------------------------------||
+  // |==(2)=========================================================|
   // |                                                              |
   // |                                                              |
   // | Debugger (devtools_container_)                               |
   // |                                                              |
   // |                                                              |
   // |--------------------------------------------------------------|
   // | Active downloads (download_shelf_)                           |
   // ----------------------------------------------------------------
   //
   // (1) - tabstrip_, default position
-  // (2) - sidebar_split_
-  // (3) - contents_split_
+  // (2) - 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.
   AbstractTabStripView* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
   ToolbarView* toolbar_;
 
   // The Bookmark Bar View for this window. Lazily created.
   scoped_ptr<BookmarkBarView> bookmark_bar_view_;
 
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
   // The download shelf view (view at the bottom of the page).  ChromiumOS
   // uses ActiveDownloadsUI instead.
   scoped_ptr<DownloadShelfView> download_shelf_;
 #endif
 
   // The InfoBarContainerView that contains InfoBars for the current tab.
   InfoBarContainerView* infobar_container_;
 
-  // The view that contains sidebar for the current tab.
-  TabContentsContainer* sidebar_container_;
-
-  // Split view containing the contents container and sidebar container.
-  views::SingleSplitView* sidebar_split_;
-
   // The view that contains the selected TabContents.
   TabContentsContainer* contents_container_;
 
   // The view that contains devtools window for the selected TabContents.
   TabContentsContainer* devtools_container_;
 
   // The view that contains instant's TabContents.
   TabContentsContainer* preview_container_;
 
   // The view managing both the contents_container_ and preview_container_.
@@ skipping 52 matching lines @@
 
 #if defined(USE_AURA)
   scoped_ptr<LauncherIconUpdater> icon_updater_;
 #endif
 
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserView> loading_animation_timer_;
 
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
-  content::NotificationRegistrar registrar_;
-
   // Used to measure the loading spinner animation rate.
   base::TimeTicks last_animation_time_;
 
   // If this flag is set then SetFocusToLocationBar() will set focus to the
   // location bar even if the browser window is not active.
   bool force_location_bar_focus_;
 
   PendingFullscreenRequest fullscreen_request_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_