Cleanup: Remove pointless GetInsets() override. Simplify |container_size_| to...

Cleanup: Remove pointless GetInsets() override.  Simplify |container_size_| to just be |container_width_|.  Fix indenting/alignment, especially of function parameters.  L"" -> std::wstring().  Don't handle assertion violations (style guide/simplicity).  Reduce indenting via early-return or simpler-path-return.  Streamline code where possible.  Definition order should match declaration order.  EXPECT_STREQ -> EXPECT_EQ.

BUG=50107
TEST=none
Review URL: http://codereview.chromium.org/3076001

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

chrome/browser/views/browser_actions_container.h

@@ -68,10 +68,6 @@ class BrowserActionButton : public views::MenuButton,
   // Returns the default icon, if any.
   const SkBitmap& default_icon() const { return default_icon_; }
 
-  // Overridden from views::View. Return a 0-inset so the icon can draw all the
-  // way to the edge of the view if it wants.
-  virtual gfx::Insets GetInsets() const;
-
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
@@ -236,9 +232,9 @@ class BrowserActionView : public views::View {
 // visible icons. This can be triggered when the user finishes resizing the
 // container or when Browser Actions are added/removed.
 //
-// We always animate from the current width (container_size_.width()) to the
-// target size (animation_target_size_), using |resize_amount| to keep track of
-// the animation progress.
+// We always animate from the current width (container_width_) to the target
+// size (animation_target_size_), using |resize_amount| to keep track of the
+// animation progress.
 //
 // NOTE: When adding Browser Actions to a maximum width container (no overflow)
 // we make sure to suppress the chevron menu if it wasn't visible. This is
@@ -248,15 +244,15 @@ class BrowserActionView : public views::View {
 //
 ////////////////////////////////////////////////////////////////////////////////
 class BrowserActionsContainer
-  : public views::View,
-    public views::ViewMenuDelegate,
-    public views::DragController,
-    public views::ResizeArea::ResizeAreaDelegate,
-    public AnimationDelegate,
-    public ExtensionToolbarModel::Observer,
-    public BrowserActionOverflowMenuController::Observer,
-    public ExtensionContextMenuModel::PopupDelegate,
-    public ExtensionPopup::Observer {
+    : public views::View,
+      public views::ViewMenuDelegate,
+      public views::DragController,
+      public views::ResizeArea::ResizeAreaDelegate,
+      public AnimationDelegate,
+      public ExtensionToolbarModel::Observer,
+      public BrowserActionOverflowMenuController::Observer,
+      public ExtensionContextMenuModel::PopupDelegate,
+      public ExtensionPopup::Observer {
  public:
   BrowserActionsContainer(Browser* browser, views::View* owner_view);
   virtual ~BrowserActionsContainer();
@@ -460,8 +456,8 @@ class BrowserActionsContainer
   // The model that tracks the order of the toolbar icons.
   ExtensionToolbarModel* model_;
 
-  // The current size of the container.
-  gfx::Size container_size_;
+  // The current width of the container.
+  int container_width_;
 
   // The resize area for the container.
   views::ResizeArea* resize_area_;

chrome/browser/views/browser_actions_container_browsertest.cc

@@ -83,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) {
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
   std::string idB = browser_actions_bar()->GetExtensionId(1);
 
-  EXPECT_STRNE(idA.c_str(), idB.c_str());
+  EXPECT_NE(idA, idB);
 
   // Load extension C (contains browser action).
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) {
   DisableExtension(idA);
   EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idB.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(0));
 
   // Enable A again. A should get its spot in the same location and the bar
   // should not grow (chevron is showing). For details: http://crbug.com/35349.
@@ -110,19 +110,19 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) {
   EnableExtension(idA);
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
 
   // Disable C (in overflow). State becomes: A, [B].
   DisableExtension(idC);
   EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
 
   // Enable C again. State becomes: A, [B, C].
   EnableExtension(idC);
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(0));
 
   // Now we have 3 extensions. Make sure they are all visible. State: A, B, C.
   browser_actions_bar()->SetIconVisibilityCount(3);
@@ -132,23 +132,23 @@ IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) {
   DisableExtension(idA);
   EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idB.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(0));
 
   // Disable extension B (should disappear). State becomes: C.
   DisableExtension(idB);
   EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idC.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idC, browser_actions_bar()->GetExtensionId(0));
 
   // Enable B (makes B and C showing now). State becomes: B, C.
   EnableExtension(idB);
   EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idB.c_str(), browser_actions_bar()->GetExtensionId(0).c_str());
+  EXPECT_EQ(idB, browser_actions_bar()->GetExtensionId(0));
 
   // Enable A (makes A, B and C showing now). State becomes: B, C, A.
   EnableExtension(idA);
   EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions());
   EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions());
-  EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(2).c_str());
+  EXPECT_EQ(idA, browser_actions_bar()->GetExtensionId(2));
 }