Remove pre-MD code from bookmark bar (Views).

chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_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_instructions_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 
 namespace {
 
 // Horizontal padding, in pixels, between the link and label.
 int GetViewPadding() {
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    static int space_width =
-        views::Label(base::ASCIIToUTF16(" ")).GetPreferredSize().width();
-    return space_width;
-  }
-
-  // Pre-MD is hard-coded to 6px.
-  return 6;
+  static int space_width =
+      views::Label(base::ASCIIToUTF16(" ")).GetPreferredSize().width();
+  return space_width;
 }
 
 }  // namespace
 
 BookmarkBarInstructionsView::BookmarkBarInstructionsView(
     BookmarkBarInstructionsDelegate* delegate)
     : delegate_(delegate),
       instructions_(NULL),
       import_link_(NULL),
       updated_colors_(false) {
@@ skipping 79 matching lines @@
   const ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (!theme_provider)
     return;
   updated_colors_ = true;
   SkColor text_color = theme_provider->GetColor(
       ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT);
   instructions_->SetEnabledColor(text_color);
   if (!import_link_)
     return;
 
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    import_link_->SetEnabledColor(text_color);
-  } else {
-    // For MD, use the default link color if it provides enough contrast. If
-    // contrast is too low, fall back to the bookmark text color and use an
-    // underline to make it obvious it's a link. The default color readability
-    // code (which only adjusts luminance) doesn't work well in this case.
-    SkColor bg = theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR);
-    SkColor link_color =
-        GetNativeTheme()->GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
-    bool link_has_contrast = color_utils::GetContrastRatio(link_color, bg) >=
-                             color_utils::kMinimumReadableContrastRatio;
-    import_link_->SetUnderline(!link_has_contrast);
-    import_link_->SetEnabledColor(link_has_contrast ? link_color : text_color);
-  }
+  // Use the default link color if it provides enough contrast. If
+  // contrast is too low, fall back to the bookmark text color and use an
+  // underline to make it obvious it's a link. The default color readability
+  // code (which only adjusts luminance) doesn't work well in this case.
+  SkColor bg = theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR);
+  SkColor link_color =
+      GetNativeTheme()->GetSystemColor(ui::NativeTheme::kColorId_LinkEnabled);
+  bool link_has_contrast = color_utils::GetContrastRatio(link_color, bg) >=
+                           color_utils::kMinimumReadableContrastRatio;
+  import_link_->SetUnderline(!link_has_contrast);
+  import_link_->SetEnabledColor(link_has_contrast ? link_color : text_color);
 }