| 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 "ui/native_theme/common_theme.h" | 5 #include "ui/native_theme/common_theme.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "third_party/skia/include/core/SkCanvas.h" | 9 #include "third_party/skia/include/core/SkCanvas.h" |
| 10 #include "ui/base/material_design/material_design_controller.h" | 10 #include "ui/base/material_design/material_design_controller.h" |
| 11 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/gfx/canvas.h" | 12 #include "ui/gfx/canvas.h" |
| 13 #include "ui/gfx/color_palette.h" | 13 #include "ui/gfx/color_palette.h" |
| 14 #include "ui/gfx/color_utils.h" | 14 #include "ui/gfx/color_utils.h" |
| 15 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 16 #include "ui/gfx/image/image_skia.h" |
| 17 #include "ui/gfx/skia_util.h" | 17 #include "ui/gfx/skia_util.h" |
| 18 #include "ui/resources/grit/ui_resources.h" | |
| 19 | 18 |
| 20 namespace ui { | 19 namespace ui { |
| 21 | 20 |
| 22 SkColor GetAuraColor(NativeTheme::ColorId color_id, | 21 SkColor GetAuraColor(NativeTheme::ColorId color_id, |
| 23 const NativeTheme* base_theme) { | 22 const NativeTheme* base_theme) { |
| 24 // Second wave of MD colors (colors that only appear in secondary UI). | 23 // Second wave of MD colors (colors that only appear in secondary UI). |
| 25 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { | 24 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
| 26 static const SkColor kPrimaryTextColor = SK_ColorBLACK; | 25 static const SkColor kPrimaryTextColor = SK_ColorBLACK; |
| 27 | 26 |
| 28 switch (color_id) { | 27 switch (color_id) { |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 } | 347 } |
| 349 if (menu_item.corner_radius > 0) { | 348 if (menu_item.corner_radius > 0) { |
| 350 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); | 349 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); |
| 351 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, flags); | 350 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, flags); |
| 352 return; | 351 return; |
| 353 } | 352 } |
| 354 canvas->drawRect(gfx::RectToSkRect(rect), flags); | 353 canvas->drawRect(gfx::RectToSkRect(rect), flags); |
| 355 } | 354 } |
| 356 | 355 |
| 357 } // namespace ui | 356 } // namespace ui |
| OLD | NEW |