Make some updates to BM bar for MD.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 113 matching lines @@
 // The color gradient value for the middle of the divider.
 static const SkColor kMiddleDividerColor = SkColorSetRGB(194, 205, 212);
 
 // Number of pixels the attached bookmark bar overlaps with the toolbar.
 static const int kToolbarAttachedBookmarkBarOverlap = 3;
 
 // Margins around the content.
 static const int kDetachedTopMargin = 1;  // When attached, we use 0 and let the
                                           // toolbar above serve as the margin.
 static const int kBottomMargin = 2;
-static const int kLeftMargin = 1;
-static const int kRightMargin = 1;
+// The margin at the start and end of the bar, in dp, indexed by MD mode.
+static const int kHorizontalMargin[] = {1, 4, 4};
 
 // Padding between buttons.
 static const int kButtonPadding = 0;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
 // Width of the drop indicator.
 static const int kDropIndicatorWidth = 2;
 
@@ skipping 35 matching lines @@
 namespace {
 
 // To enable/disable BookmarkBar animations during testing. In production
 // animations are enabled by default.
 bool animations_enabled = true;
 
 gfx::ImageSkia* GetImageSkiaNamed(int id) {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
 }
 
+int GetHorizontalMargin() {
+  return kHorizontalMargin[ui::MaterialDesignController::GetMode()];
+}
+
 // BookmarkButtonBase -----------------------------------------------
 
 // Base class for buttons used on the bookmark bar.
 
 class BookmarkButtonBase : public views::LabelButton {
  public:
   BookmarkButtonBase(views::ButtonListener* listener,
                      const base::string16& title)
       : LabelButton(listener, title) {
     SetElideBehavior(kElideBehavior);
@@ skipping 38 matching lines @@
 
 class BookmarkButton : public BookmarkButtonBase {
  public:
   // The internal view class name.
   static const char kViewClassName[];
 
   BookmarkButton(views::ButtonListener* listener,
                  const GURL& url,
                  const base::string16& title,
                  Profile* profile)
-      : BookmarkButtonBase(listener, title),
-        url_(url),
-        profile_(profile) {
-  }
+      : BookmarkButtonBase(listener, title), url_(url), profile_(profile) {}
 
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = BookmarkBarView::CreateToolTipForURLAndTitle(
         GetWidget(), location, url_, GetText(), profile_);
     return !tooltip->empty();
   }
 
@@ skipping 538 matching lines @@
   }
   return true;
 }
 
 gfx::Size BookmarkBarView::GetMinimumSize() const {
   // The minimum width of the bookmark bar should at least contain the overflow
   // button, by which one can access all the Bookmark Bar items, and the "Other
   // Bookmarks" folder, along with appropriate margins and button padding.
   // It should also contain the Managed and/or Supervised Bookmarks folders,
   // if they are visible.
-  int width = kLeftMargin;
+  int width = GetHorizontalMargin();
 
   int height = chrome::kBookmarkBarHeight;
   if (IsDetached()) {
     double current_state = 1 - size_animation_->GetCurrentValue();
     width += 2 * static_cast<int>(kNewTabHorizontalPadding * current_state);
     height += static_cast<int>(
         (chrome::kNTPBookmarkBarHeight - chrome::kBookmarkBarHeight) *
             current_state);
   }
 
@@ skipping 23 matching lines @@
   }
 
   return gfx::Size(width, height);
 }
 
 void BookmarkBarView::Layout() {
   // Skip layout during destruction, when no model exists.
   if (!model_)
     return;
 
-  int x = kLeftMargin;
+  int x = GetHorizontalMargin();
   int top_margin = IsDetached() ? kDetachedTopMargin : 0;
   int y = top_margin;
-  int width = View::width() - kRightMargin - kLeftMargin;
+  int width = View::width() - 2 * GetHorizontalMargin();
   int height = chrome::kBookmarkBarHeight - kBottomMargin;
   int separator_margin = kSeparatorMargin;
 
   if (IsDetached()) {
     double current_state = 1 - size_animation_->GetCurrentValue();
     x += static_cast<int>(kNewTabHorizontalPadding * current_state);
     y += (View::height() - chrome::kBookmarkBarHeight) / 2;
     width -= static_cast<int>(kNewTabHorizontalPadding * current_state);
     separator_margin -= static_cast<int>(kSeparatorMargin * current_state);
   } else {
@@ skipping 134 matching lines @@
       drop_info_->location.operation != 0 && drop_info_->location.index != -1 &&
       drop_info_->location.button_type != DROP_OVERFLOW &&
       !drop_info_->location.on) {
     int index = drop_info_->location.index;
     DCHECK(index <= GetBookmarkButtonCount());
     int x = 0;
     int y = 0;
     int h = height();
     if (index == GetBookmarkButtonCount()) {
       if (index == 0) {
-        x = kLeftMargin;
+        x = GetHorizontalMargin();
       } else {
         x = GetBookmarkButton(index - 1)->x() +
             GetBookmarkButton(index - 1)->width();
       }
     } else {
       x = GetBookmarkButton(index)->x();
     }
     if (GetBookmarkButtonCount() > 0 && GetBookmarkButton(0)->visible()) {
       y = GetBookmarkButton(0)->y();
       h = GetBookmarkButton(0)->height();
@@ skipping 1065 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }