| Index: chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
|
| index a209a2ed72bbf389b9818aa635e38d8f82d2f200..426c4d139f407ba1020fc470672ef742e1be79c0 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
|
| +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm
|
| @@ -15,12 +15,6 @@
|
| #include "ui/gfx/color_palette.h"
|
|
|
| SelectedKeywordDecoration::SelectedKeywordDecoration() {
|
| - if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| - search_image_.reset([OmniboxViewMac::ImageForResource(
|
| - IDR_KEYWORD_SEARCH_MAGNIFIER) retain]);
|
| - SetTextColor([NSColor blackColor]);
|
| - return;
|
| - }
|
| // Note: the unit test
|
| // SelectedKeywordDecorationTest.UsesPartialKeywordIfNarrow expects to work
|
| // with a fully-initialized SelectedKeywordDecoration (i.e. one that has a
|
| @@ -35,9 +29,6 @@
|
| SelectedKeywordDecoration::~SelectedKeywordDecoration() {}
|
|
|
| NSColor* SelectedKeywordDecoration::GetBackgroundBorderColor() {
|
| - if (!ui::MaterialDesignController::IsModeMaterial()) {
|
| - return skia::SkColorToCalibratedNSColor(gfx::kGoogleBlue700);
|
| - }
|
| return skia::SkColorToSRGBNSColor(gfx::kGoogleBlue700);
|
| }
|
|
|
| @@ -69,9 +60,7 @@
|
| bool is_extension_keyword) {
|
| const base::string16 min_name(
|
| location_bar_util::CalculateMinString(short_name));
|
| - const int keyword_text_id = ui::MaterialDesignController::IsModeMaterial()
|
| - ? IDS_OMNIBOX_KEYWORD_TEXT_MD
|
| - : IDS_OMNIBOX_KEYWORD_TEXT;
|
| + const int keyword_text_id = IDS_OMNIBOX_KEYWORD_TEXT_MD;
|
|
|
| NSString* full_string =
|
| is_extension_keyword
|
|
|