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

chrome/browser/views/extensions/extension_shelf.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/extensions/extension_shelf.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
 
 // We need an extra margin to the left of all the toolstrips in detached mode,
 // so that the first toolstrip doesn't look so squished against the rounded
 // corners of the extension shelf.
 static const int kNewtabExtraHorMargin = 2;
 static const int kNewtabExtraVerMargin = 2;
 
 // Height of the toolstrip within the shelf.
 static const int kToolstripHeight = kShelfHeight - (kTopMargin + kBottomMargin);
 
-// Colors for the ExtensionShelf.
-static const SkColor kDividerHighlightColor = SkColorSetRGB(247, 250, 253);
-
 // Handle padding.
 static const int kHandlePadding = 4;
 
 // Delays for showing and hiding the shelf handle.
 static const int kShowDelayMs = 500;
 static const int kHideDelayMs = 300;
 
 }  // namespace
 
 
@@ skipping 574 matching lines @@
   InitBackground(canvas, background_rect);
 
   // Draw vertical dividers between Toolstrip items in the Extension shelf.
   int count = GetChildViewCount();
   for (int i = 0; i < count; ++i) {
     int right = GetChildViewAt(i)->bounds().right() + kToolstripPadding;
     int vertical_padding = IsDetached() ? (height() - kShelfHeight) / 2 : 1;
 
     DetachableToolbarView::PaintVerticalDivider(
         canvas, right, height(), vertical_padding,
-        SK_ColorWHITE,
-        kDividerHighlightColor,
+        DetachableToolbarView::kEdgeDividerColor,
+        DetachableToolbarView::kMiddleDividerColor,
         GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR));
   }
 }
 
 // static
 void ExtensionShelf::ToggleWhenExtensionShelfVisible(Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
   const bool always_show = !prefs->GetBoolean(prefs::kShowExtensionShelf);
 
   // The user changed when the Extension Shelf is shown, update the
@@ skipping 358 matching lines @@
 
 bool ExtensionShelf::IsAlwaysShown() const {
   Profile* profile = browser_->profile();
   return profile->GetPrefs()->GetBoolean(prefs::kShowExtensionShelf);
 }
 
 bool ExtensionShelf::OnNewTabPage() const {
   return (browser_ && browser_->GetSelectedTabContents() &&
       browser_->GetSelectedTabContents()->IsExtensionShelfAlwaysVisible());
 }