Rip Out the Sidebar API

chrome/browser/ui/cocoa/browser_window_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
-#import "chrome/browser/ui/cocoa/sidebar_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
@@ skipping 217 matching lines @@
 
     // Size and position the window.  Note that it is not yet onscreen.  Popup
     // windows may get resized later on in this function, once the actual size
     // of the toolbar/tabstrip is known.
     windowShim_->SetBounds(windowRect);
 
     // Puts the incognito badge on the window frame, if necessary.
     [self installAvatar];
 
     // Create a sub-controller for the docked devTools and add its view to the
-    // hierarchy.  This must happen before the sidebar controller is
-    // instantiated.
+    // hierarchy.
     devToolsController_.reset(
         [[DevToolsController alloc] initWithDelegate:self]);
     [[devToolsController_ view] setFrame:[[self tabContentArea] bounds]];
     [[self tabContentArea] addSubview:[devToolsController_ view]];
 
-    // Create a sub-controller for the docked sidebar and add its view to the
-    // hierarchy.  This must happen before the previewable contents controller
-    // is instantiated.
-    sidebarController_.reset([[SidebarController alloc] initWithDelegate:self]);
-    [[sidebarController_ view] setFrame:[[devToolsController_ view] bounds]];
-    [[devToolsController_ view] addSubview:[sidebarController_ view]];
-
     // Create the previewable contents controller.  This provides the switch
     // view that TabStripController needs.
     previewableContentsController_.reset(
         [[PreviewableContentsController alloc] init]);
     [[previewableContentsController_ view]
-        setFrame:[[sidebarController_ view] bounds]];
-    [[sidebarController_ view]
+        setFrame:[[devToolsController_ view] bounds]];
+    [[devToolsController_ view]
         addSubview:[previewableContentsController_ view]];
 
     // Create a controller for the tab strip, giving it the model object for
     // this window's Browser and the tab strip view. The controller will handle
     // registering for the appropriate tab notifications from the back-end and
     // managing the creation of new tabs.
     [self createTabStripController];
 
     // Create a controller for the toolbar, giving it the toolbar model object
     // and the toolbar view from the nib. The controller will handle
@@ skipping 210 matching lines @@
   [devToolsController_ updateDevToolsForWebContents:contents
                                         withProfile:browser_->profile()];
   [devToolsController_ ensureContentsVisible];
 }
 
 - (void)setDevToolsDockToRight:(bool)dock_to_right {
   [devToolsController_ setDockToRight:dock_to_right
                           withProfile:browser_->profile()];
 }
 
-- (void)updateSidebarForContents:(TabContents*)contents {
-  [sidebarController_ updateSidebarForTabContents:contents];
-  [sidebarController_ ensureContentsVisible];
-}
-
 // Called when the user wants to close a window or from the shutdown process.
 // The Browser object is in control of whether or not we're allowed to close. It
 // may defer closing due to several states, such as onUnload handlers needing to
 // be fired. If closing is deferred, the Browser will handle the processing
 // required to get us to the closing state and (by watching for all the tabs
 // going away) will again call to close the window when it's finally ready.
 - (BOOL)windowShouldClose:(id)sender {
   // Disable updates while closing all tabs to avoid flickering.
   gfx::ScopedNSDisableScreenUpdates disabler;
   // Give beforeunload handlers the chance to cancel the close before we hide
@@ skipping 964 matching lines @@
 }
 
 // TabStripControllerDelegate protocol.
 - (void)onActivateTabWithContents:(WebContents*)contents {
   // Update various elements that are interested in knowing the current
   // TabContents.
 
   // Update all the UI bits.
   windowShim_->UpdateTitleBar();
 
-  [sidebarController_ updateSidebarForTabContents:
-      static_cast<TabContents*>(contents)];
   [devToolsController_ updateDevToolsForWebContents:contents
                                         withProfile:browser_->profile()];
 
   // Update the bookmark bar.
-  // Must do it after sidebar and devtools update, otherwise bookmark bar might
+  // Must do it after devtools updates, otherwise bookmark bar might
   // call resizeView -> layoutSubviews and cause unnecessary relayout.
   // TODO(viettrungluu): perhaps update to not terminate running animations (if
   // applicable)?
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
   // Without the .get(), xcode fails.
   [infoBarContainerController_.get() changeTabContents:wrapper];
 
-  // Update devTools and sidebar contents after size for all views is set.
-  [sidebarController_ ensureContentsVisible];
+  // Update devTools contents after size for all views is set.
   [devToolsController_ ensureContentsVisible];
 }
 
 - (void)onReplaceTabWithContents:(WebContents*)contents {
   // Simply remove the preview view if it exists; the tab strip
   // controller will reinstall the view as the active view.
   [previewableContentsController_ hidePreview];
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 }
 
@@ skipping 632 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)