Mac: remove extension shelf code.

Otherwise, I'll shortly have to update it and test other changes against the extension shelf (or let bitrot set in).

The extension shelf was removed from Chrome/Chromium. This code was left in for possible future use since doing so posed no cost. The corresponding code remains in the Windows version (for experimental purposes), but has also been removed from the Linux version. If this code is ever needed again, this patch will be the one to try to revert.

BUG=30178
TEST=Trybots, to make sure everything still compiles and unit tests run cleanly.

Review URL: http://codereview.chromium.org/495004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34407 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 20 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm
index 394ef1d..5ad4050 100644
--- a/chrome/browser/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm
@@ -32,7 +32,6 @@
 - (NSView*)toolbarView;
 - (NSView*)bookmarkView;
 - (BOOL)bookmarkBarVisible;
-- (NSView*)extensionShelfView;
 @end
 
 @implementation BrowserWindowController (ExposedForTesting)
@@ -55,10 +54,6 @@
 - (BOOL)bookmarkBarVisible {
   return [bookmarkBarController_ isVisible];
 }
-
-- (NSView*)extensionShelfView {
-  return [extensionShelfController_ view];
-}
 @end
 
 class BrowserWindowControllerTest : public CocoaTest {
@@ -166,18 +161,16 @@ TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
 #endif
 
 namespace {
-// Verifies that the toolbar, infobar, tab content area, download shelf, and
-// extension shelf completely fill their window's contentView.
+// Verifies that the toolbar, infobar, tab content area, and download shelf
+// completely fill their window's contentView.
 void CheckViewPositions(BrowserWindowController* controller) {
   NSRect contentView = [[[controller window] contentView] bounds];
   NSRect toolbar = [[controller toolbarView] frame];
   NSRect infobar = [[controller infoBarContainerView] frame];
   NSRect contentArea = [[controller tabContentArea] frame];
   NSRect download = [[[controller downloadShelf] view] frame];
-  NSRect extension = [[controller extensionShelfView] frame];
 
-  EXPECT_EQ(NSMinY(contentView), NSMinY(extension));
-  EXPECT_EQ(NSMaxY(extension), NSMinY(download));
+  EXPECT_EQ(NSMinY(contentView), NSMinY(download));
   EXPECT_EQ(NSMaxY(download), NSMinY(contentArea));
   EXPECT_EQ(NSMaxY(contentArea), NSMinY(infobar));
 
@@ -326,7 +319,6 @@ TEST_F(BrowserWindowControllerTest, TestResizeViews) {
   NSView* contentView = [[tabstrip window] contentView];
   NSView* toolbar = [controller_ toolbarView];
   NSView* infobar = [controller_ infoBarContainerView];
-  NSView* extensionShelf = [controller_ extensionShelfView];
 
   // We need to muck with the views a bit to put us in a consistent state before
   // we start resizing.  In particular, we need to move the tab strip to be
@@ -347,10 +339,6 @@ TEST_F(BrowserWindowControllerTest, TestResizeViews) {
   [controller_ layoutSubviews];
   CheckViewPositions(controller_);
 
-  // Add an extension shelf and recheck.
-  [controller_ resizeView:extensionShelf newHeight:40];
-  CheckViewPositions(controller_);
-
   // Expand the infobar to 60px and recheck
   [controller_ resizeView:infobar newHeight:60];
   CheckViewPositions(controller_);
@@ -380,7 +368,6 @@ TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
   NSView* toolbar = [controller_ toolbarView];
   NSView* bookmark = [controller_ bookmarkView];
   NSView* infobar = [controller_ infoBarContainerView];
-  NSView* extensionShelf = [controller_ extensionShelfView];
 
   // We need to muck with the views a bit to put us in a consistent state before
   // we start resizing.  In particular, we need to move the tab strip to be
@@ -405,10 +392,6 @@ TEST_F(BrowserWindowControllerTest, TestResizeViewsWithBookmarkBar) {
   [controller_ resizeView:bookmark newHeight:40];
   CheckViewPositions(controller_);
 
-  // Add an extension shelf and recheck.
-  [controller_ resizeView:extensionShelf newHeight:40];
-  CheckViewPositions(controller_);
-
   // Expand the infobar to 60px and recheck
   [controller_ resizeView:infobar newHeight:60];
   CheckViewPositions(controller_);