| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 const color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; | 125 const color_utils::HSL kDefaultTintBackgroundTab = {-1, -1, 0.75}; |
| 126 | 126 |
| 127 // ---------------------------------------------------------------------------- | 127 // ---------------------------------------------------------------------------- |
| 128 // 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. |
| 129 | 129 |
| 130 const SkColor kDefaultColorControlBackground = SK_ColorWHITE; | 130 const SkColor kDefaultColorControlBackground = SK_ColorWHITE; |
| 131 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { | 131 const SkColor kDefaultDetachedBookmarkBarSeparator[] = { |
| 132 SkColorSetRGB(170, 170, 171), SkColorSetRGB(182, 180, 182)}; | 132 SkColorSetRGB(170, 170, 171), SkColorSetRGB(182, 180, 182)}; |
| 133 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { | 133 const SkColor kDefaultDetachedBookmarkBarSeparatorIncognito[] = { |
| 134 SkColorSetRGB(170, 170, 171), SkColorSetRGB(0x28, 0x28, 0x28)}; | 134 SkColorSetRGB(170, 170, 171), SkColorSetRGB(0x28, 0x28, 0x28)}; |
| 135 const SkColor kDefaultToolbarTopSeparator = SkColorSetA(SK_ColorBLACK, 0x40); | |
| 136 | 135 |
| 137 #if defined(OS_MACOSX) | 136 #if defined(OS_MACOSX) |
| 138 const SkColor kDefaultColorFrameVibrancyOverlay[] = { | 137 const SkColor kDefaultColorFrameVibrancyOverlay[] = { |
| 139 SkColorSetARGB(25, 0, 0, 0), SkColorSetARGB(230, 20, 22, 24)}; | 138 SkColorSetARGB(25, 0, 0, 0), SkColorSetARGB(230, 20, 22, 24)}; |
| 140 const SkColor kDefaultColorToolbarInactive[] = { | 139 const SkColor kDefaultColorToolbarInactive[] = { |
| 141 SkColorSetRGB(255, 0, 0), SkColorSetRGB(246, 246, 246)}; | 140 SkColorSetRGB(255, 0, 0), SkColorSetRGB(246, 246, 246)}; |
| 142 const SkColor kDefaultColorToolbarInactiveIncognito[] = { | 141 const SkColor kDefaultColorToolbarInactiveIncognito[] = { |
| 143 SkColorSetRGB(255, 0, 0), SkColorSetRGB(45, 45, 45)}; | 142 SkColorSetRGB(255, 0, 0), SkColorSetRGB(45, 45, 45)}; |
| 144 const SkColor kDefaultColorTabBackgroundInactive[] = { | 143 const SkColor kDefaultColorTabBackgroundInactive[] = { |
| 145 SkColorSetRGB(255, 0, 0), SkColorSetRGB(236, 236, 236)}; | 144 SkColorSetRGB(255, 0, 0), SkColorSetRGB(236, 236, 236)}; |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 // Properties not stored in theme pack. | 354 // Properties not stored in theme pack. |
| 356 case COLOR_CONTROL_BACKGROUND: | 355 case COLOR_CONTROL_BACKGROUND: |
| 357 return kDefaultColorControlBackground; | 356 return kDefaultColorControlBackground; |
| 358 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: | 357 case COLOR_TOOLBAR_BOTTOM_SEPARATOR: |
| 359 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: | 358 case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR: |
| 360 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] | 359 return otr ? kDefaultDetachedBookmarkBarSeparatorIncognito[mode] |
| 361 : kDefaultDetachedBookmarkBarSeparator[mode]; | 360 : kDefaultDetachedBookmarkBarSeparator[mode]; |
| 362 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: | 361 case COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND: |
| 363 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] | 362 return otr ? kDefaultDetachedBookmarkBarBackgroundIncognito[mode] |
| 364 : kDefaultDetachedBookmarkBarBackground[mode]; | 363 : kDefaultDetachedBookmarkBarBackground[mode]; |
| 365 case COLOR_TOOLBAR_TOP_SEPARATOR: | |
| 366 return kDefaultToolbarTopSeparator; | |
| 367 #if defined(OS_MACOSX) | 364 #if defined(OS_MACOSX) |
| 368 case COLOR_FRAME_VIBRANCY_OVERLAY: | 365 case COLOR_FRAME_VIBRANCY_OVERLAY: |
| 369 return kDefaultColorFrameVibrancyOverlay[otr]; | 366 return kDefaultColorFrameVibrancyOverlay[otr]; |
| 370 case COLOR_TOOLBAR_INACTIVE: | 367 case COLOR_TOOLBAR_INACTIVE: |
| 371 return otr ? kDefaultColorToolbarInactiveIncognito[mode] | 368 return otr ? kDefaultColorToolbarInactiveIncognito[mode] |
| 372 : kDefaultColorToolbarInactive[mode]; | 369 : kDefaultColorToolbarInactive[mode]; |
| 373 case COLOR_BACKGROUND_TAB_INACTIVE: | 370 case COLOR_BACKGROUND_TAB_INACTIVE: |
| 374 return otr ? kDefaultColorTabBackgroundInactiveIncognito[mode] | 371 return otr ? kDefaultColorTabBackgroundInactiveIncognito[mode] |
| 375 : kDefaultColorTabBackgroundInactive[mode]; | 372 : kDefaultColorTabBackgroundInactive[mode]; |
| 376 case COLOR_TOOLBAR_BUTTON_STROKE: | 373 case COLOR_TOOLBAR_BUTTON_STROKE: |
| (...skipping 14 matching lines...) Expand all Loading... |
| 391 #endif | 388 #endif |
| 392 case COLOR_FRAME_INCOGNITO: | 389 case COLOR_FRAME_INCOGNITO: |
| 393 case COLOR_FRAME_INCOGNITO_INACTIVE: | 390 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 394 NOTREACHED() << "These values should be queried via their respective " | 391 NOTREACHED() << "These values should be queried via their respective " |
| 395 "non-incognito equivalents and an appropriate |otr| " | 392 "non-incognito equivalents and an appropriate |otr| " |
| 396 "value."; | 393 "value."; |
| 397 default: | 394 default: |
| 398 return gfx::kPlaceholderColor; | 395 return gfx::kPlaceholderColor; |
| 399 } | 396 } |
| 400 } | 397 } |
| OLD | NEW |