| 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 "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/strings/string_split.h" | 9 #include "base/strings/string_split.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 // Default tints. | 116 // Default tints. |
| 117 const color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; | 117 const color_utils::HSL kDefaultTintButtons = {-1, -1, -1}; |
| 118 // In pre-md, reuse the normal tint for incognito. | 118 // In pre-md, reuse the normal tint for incognito. |
| 119 const color_utils::HSL kDefaultTintButtonsIncognito[] = {{-1, -1, -1}, | 119 const color_utils::HSL kDefaultTintButtonsIncognito[] = {{-1, -1, -1}, |
| 120 {-1, -1, 0.85}}; | 120 {-1, -1, 0.85}}; |
| 121 const color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; | 121 const color_utils::HSL kDefaultTintFrame = {-1, -1, -1}; |
| 122 const color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; | 122 const color_utils::HSL kDefaultTintFrameInactive = {-1, -1, 0.75}; |
| 123 const color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; | 123 const color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2, 0.35}; |
| 124 const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; | 124 const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3, 0.6}; |
| 125 #if defined(OS_MACOSX) | 125 const color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
| 126 const color_utils::HSL kDefaultTintBackgroundTab = { -1, -1, 0.4496875 }; | |
| 127 #else | |
| 128 const color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; | |
| 129 #endif // OS_MACOSX | |
| 130 | 126 |
| 131 // ---------------------------------------------------------------------------- | 127 // ---------------------------------------------------------------------------- |
| 132 // Defaults for properties which are not stored in the browser theme pack. | 128 // Defaults for properties which are not stored in the browser theme pack. |
| 133 | 129 |
| 134 const SkColor kDefaultColorControlBackground = SK_ColorWHITE; | 130 const SkColor kDefaultColorControlBackground = SK_ColorWHITE; |
| 135 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { | 131 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { |
| 136 SkColorSetRGB(170, 170, 171), SkColorSetRGB(182, 180, 182)}; | 132 SkColorSetRGB(170, 170, 171), SkColorSetRGB(182, 180, 182)}; |
| 137 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { | 133 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { |
| 138 SkColorSetRGB(170, 170, 171), SkColorSetRGB(0x28, 0x28, 0x28)}; | 134 SkColorSetRGB(170, 170, 171), SkColorSetRGB(0x28, 0x28, 0x28)}; |
| 139 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); | 135 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 #endif | 391 #endif |
| 396 case COLOR_FRAME_INCOGNITO: | 392 case COLOR_FRAME_INCOGNITO: |
| 397 case COLOR_FRAME_INCOGNITO_INACTIVE: | 393 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 398 NOTREACHED() << "These values should be queried via their respective " | 394 NOTREACHED() << "These values should be queried via their respective " |
| 399 "non-incognito equivalents and an appropriate |otr| " | 395 "non-incognito equivalents and an appropriate |otr| " |
| 400 "value."; | 396 "value."; |
| 401 default: | 397 default: |
| 402 return gfx::kPlaceholderColor; | 398 return gfx::kPlaceholderColor; |
| 403 } | 399 } |
| 404 } | 400 } |
| OLD | NEW |