Unified the color definitions for the dividers so that extension shelf is usi...

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2009 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/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
@@ skipping 59 matching lines @@
 
 // Command ids used in the menu allowing the user to choose when we're visible.
 static const int kAlwaysShowCommandID = 1;
 
 // Icon to display when one isn't found for the page.
 static SkBitmap* kDefaultFavIcon = NULL;
 
 // Icon used for folders.
 static SkBitmap* kFolderIcon = NULL;
 
-// Border colors for the BookmarBarView.
-static const SkColor kTopBorderColor = SkColorSetRGB(222, 234, 248);
-
 // Offset for where the menu is shown relative to the bottom of the
 // BookmarkBarView.
 static const int kMenuOffset = 3;
 
 // Delay during drag and drop before the menu pops up. This is only used if
 // we can't get the value from the OS.
 static const int kShowFolderDropMenuDelay = 400;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
 // Width of the drop indicator.
 static const int kDropIndicatorWidth = 2;
 
 // Distance between the bottom of the bar and the separator.
 static const int kSeparatorMargin = 1;
 
 // Width of the separator between the recently bookmarked button and the
 // overflow indicator.
 static const int kSeparatorWidth = 4;
 
 // Starting x-coordinate of the separator line within a separator.
 static const int kSeparatorStartX = 2;
 
-// Border color along the left edge of the view representing the most recently
-// view pages.
-static const SkColor kSeparatorColor = SkColorSetRGB(194, 205, 212);
-
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
 // Color of the instructional text.
 static const SkColor kInstructionsColor = SkColorSetRGB(128, 128, 142);
 
 // Tag for the 'Other bookmarks' button.
 static const int kOtherFolderButtonTag = 1;
 
 #ifdef CHROME_PERSONALIZATION
@@ skipping 167 matching lines @@
 
 // ButtonSeparatorView  --------------------------------------------------------
 
 class BookmarkBarView::ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
 
   virtual void Paint(gfx::Canvas* canvas) {
     DetachableToolbarView::PaintVerticalDivider(
-        canvas, kSeparatorStartX, height(), 1, kTopBorderColor,
-        kSeparatorColor,
+        canvas, kSeparatorStartX, height(), 1,
+        DetachableToolbarView::kEdgeDividerColor,
+        DetachableToolbarView::kMiddleDividerColor,
         GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR));
   }
 
   virtual gfx::Size GetPreferredSize() {
     // We get the full height of the bookmark bar, so that the height returned
     // here doesn't matter.
     return gfx::Size(kSeparatorWidth, 1);
   }
 
   virtual bool GetAccessibleName(std::wstring* name) {
@@ skipping 1419 matching lines @@
   sync_error_button->SetTooltipText(
       l10n_util::GetString(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC));
   sync_error_button->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_SYNC_ERROR_BUTTON));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }
 #endif