OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/search/search_ui.h" | 5 #include "chrome/browser/ui/search/search_ui.h" |
6 | 6 |
7 #include "chrome/browser/themes/theme_properties.h" | 7 #include "chrome/browser/themes/theme_properties.h" |
8 #include "chrome/browser/themes/theme_service.h" | 8 #include "chrome/browser/themes/theme_service.h" |
| 9 #include "ui/base/resource/material_design/material_design_controller.h" |
9 | 10 |
10 namespace chrome { | 11 namespace chrome { |
11 | 12 |
12 SkColor GetDetachedBookmarkBarBackgroundColor(ThemeService* theme_service) { | 13 SkColor GetDetachedBookmarkBarBackgroundColor(ThemeService* theme_service) { |
13 if (!theme_service->UsingDefaultTheme()) | 14 if (!theme_service->UsingDefaultTheme()) |
14 return theme_service->GetColor(ThemeProperties::COLOR_TOOLBAR); | 15 return theme_service->GetColor(ThemeProperties::COLOR_TOOLBAR); |
15 return SkColorSetARGB(0xFF, 0xF1, 0xF1, 0xF1); | 16 |
| 17 return ui::MaterialDesignController::IsModeMaterial() ? SK_ColorWHITE : |
| 18 SkColorSetARGB(0xFF, 0xF1, 0xF1, 0xF1); |
16 } | 19 } |
17 | 20 |
18 SkColor GetDetachedBookmarkBarSeparatorColor(ThemeService* theme_service) { | 21 SkColor GetDetachedBookmarkBarSeparatorColor(ThemeService* theme_service) { |
19 if (theme_service->UsingDefaultTheme()) { | 22 if (theme_service->UsingDefaultTheme()) { |
20 return ThemeProperties::GetDefaultColor( | 23 return ThemeProperties::GetDefaultColor( |
21 ThemeProperties::COLOR_TOOLBAR_SEPARATOR); | 24 ThemeProperties::COLOR_TOOLBAR_SEPARATOR); |
22 } | 25 } |
23 | 26 |
24 // Use 50% of bookmark text color as separator color. | 27 // Use 50% of bookmark text color as separator color. |
25 return SkColorSetA( | 28 return SkColorSetA( |
26 theme_service->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT), 128); | 29 theme_service->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT), 128); |
27 } | 30 } |
28 | 31 |
29 } // namespace chrome | 32 } // namespace chrome |
OLD | NEW |