| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/themes/theme_properties.h" | 5 #include "chrome/browser/themes/theme_properties.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| 11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "chrome/browser/themes/browser_theme_pack.h" | 13 #include "chrome/browser/themes/browser_theme_pack.h" |
| 14 #include "chrome/common/chrome_features.h" | 14 #include "chrome/common/chrome_features.h" |
| 15 #include "chrome/grit/theme_resources.h" | |
| 16 #include "ui/base/material_design/material_design_controller.h" | 15 #include "ui/base/material_design/material_design_controller.h" |
| 17 #include "ui/gfx/color_palette.h" | 16 #include "ui/gfx/color_palette.h" |
| 18 #include "ui/resources/grit/ui_resources.h" | |
| 19 | 17 |
| 20 namespace { | 18 namespace { |
| 21 | 19 |
| 22 // ---------------------------------------------------------------------------- | 20 // ---------------------------------------------------------------------------- |
| 23 // Defaults for properties which are stored in the browser theme pack. If you | 21 // Defaults for properties which are stored in the browser theme pack. If you |
| 24 // change these defaults, you must increment the version number in | 22 // change these defaults, you must increment the version number in |
| 25 // browser_theme_pack.cc. | 23 // browser_theme_pack.cc. |
| 26 | 24 |
| 27 const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC); | 25 const SkColor kDefaultColorFrame = SkColorSetRGB(0xCC, 0xCC, 0xCC); |
| 28 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xF5, 0xF5, 0xF5); | 26 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(0xF5, 0xF5, 0xF5); |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 case COLOR_FRAME_INCOGNITO: | 304 case COLOR_FRAME_INCOGNITO: |
| 307 case COLOR_FRAME_INCOGNITO_INACTIVE: | 305 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 308 NOTREACHED() << "These values should be queried via their respective " | 306 NOTREACHED() << "These values should be queried via their respective " |
| 309 "non-incognito equivalents and an appropriate |otr| " | 307 "non-incognito equivalents and an appropriate |otr| " |
| 310 "value."; | 308 "value."; |
| 311 return gfx::kPlaceholderColor; | 309 return gfx::kPlaceholderColor; |
| 312 } | 310 } |
| 313 | 311 |
| 314 return gfx::kPlaceholderColor; | 312 return gfx::kPlaceholderColor; |
| 315 } | 313 } |
| OLD | NEW |