| 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/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/strings/string_split.h" | 8 #include "base/strings/string_split.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "chrome/browser/themes/browser_theme_pack.h" | 10 #include "chrome/browser/themes/browser_theme_pack.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 // Used for theme fallback colors. | 23 // Used for theme fallback colors. |
| 24 const SkColor kDefaultColorFrame = SkColorSetRGB(109, 109, 109); | 24 const SkColor kDefaultColorFrame = SkColorSetRGB(109, 109, 109); |
| 25 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(176, 176, 176); | 25 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(176, 176, 176); |
| 26 #else | 26 #else |
| 27 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201); | 27 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201); |
| 28 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); | 28 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); |
| 29 #endif // USE_AURA | 29 #endif // USE_AURA |
| 30 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139); | 30 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139); |
| 31 const SkColor kDefaultColorFrameIncognitoInactive = | 31 const SkColor kDefaultColorFrameIncognitoInactive = |
| 32 SkColorSetRGB(126, 139, 156); | 32 SkColorSetRGB(126, 139, 156); |
| 33 const SkColor kDefaultColorFrameManagedUser = SkColorSetRGB(165, 197, 225); | |
| 34 const SkColor kDefaultColorFrameManagedUserInactive = | |
| 35 SkColorSetRGB(180, 225, 247); | |
| 36 #if defined(OS_MACOSX) | 33 #if defined(OS_MACOSX) |
| 37 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); | 34 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); |
| 38 #else | 35 #else |
| 39 const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223); | 36 const SkColor kDefaultColorToolbar = SkColorSetRGB(223, 223, 223); |
| 40 #endif | 37 #endif |
| 41 const SkColor kDefaultColorTabText = SK_ColorBLACK; | 38 const SkColor kDefaultColorTabText = SK_ColorBLACK; |
| 42 #if defined(OS_MACOSX) | 39 #if defined(OS_MACOSX) |
| 43 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK; | 40 const SkColor kDefaultColorBackgroundTabText = SK_ColorBLACK; |
| 44 #else | 41 #else |
| 45 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64); | 42 const SkColor kDefaultColorBackgroundTabText = SkColorSetRGB(64, 64, 64); |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 switch (id) { | 242 switch (id) { |
| 246 // Properties stored in theme pack. | 243 // Properties stored in theme pack. |
| 247 case COLOR_FRAME: | 244 case COLOR_FRAME: |
| 248 return kDefaultColorFrame; | 245 return kDefaultColorFrame; |
| 249 case COLOR_FRAME_INACTIVE: | 246 case COLOR_FRAME_INACTIVE: |
| 250 return kDefaultColorFrameInactive; | 247 return kDefaultColorFrameInactive; |
| 251 case COLOR_FRAME_INCOGNITO: | 248 case COLOR_FRAME_INCOGNITO: |
| 252 return kDefaultColorFrameIncognito; | 249 return kDefaultColorFrameIncognito; |
| 253 case COLOR_FRAME_INCOGNITO_INACTIVE: | 250 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 254 return kDefaultColorFrameIncognitoInactive; | 251 return kDefaultColorFrameIncognitoInactive; |
| 255 case COLOR_FRAME_MANAGED_USER: | |
| 256 return kDefaultColorFrameManagedUser; | |
| 257 case COLOR_FRAME_MANAGED_USER_INACTIVE: | |
| 258 return kDefaultColorFrameManagedUserInactive; | |
| 259 case COLOR_TOOLBAR: | 252 case COLOR_TOOLBAR: |
| 260 return kDefaultColorToolbar; | 253 return kDefaultColorToolbar; |
| 261 case COLOR_TAB_TEXT: | 254 case COLOR_TAB_TEXT: |
| 262 return kDefaultColorTabText; | 255 return kDefaultColorTabText; |
| 263 case COLOR_BACKGROUND_TAB_TEXT: | 256 case COLOR_BACKGROUND_TAB_TEXT: |
| 264 return kDefaultColorBackgroundTabText; | 257 return kDefaultColorBackgroundTabText; |
| 265 case COLOR_BOOKMARK_TEXT: | 258 case COLOR_BOOKMARK_TEXT: |
| 266 return kDefaultColorBookmarkText; | 259 return kDefaultColorBookmarkText; |
| 267 case COLOR_NTP_BACKGROUND: | 260 case COLOR_NTP_BACKGROUND: |
| 268 return kDefaultColorNTPBackground; | 261 return kDefaultColorNTPBackground; |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 case NTP_BACKGROUND_TILING: | 310 case NTP_BACKGROUND_TILING: |
| 318 *result = kDefaultDisplayPropertyNTPTiling; | 311 *result = kDefaultDisplayPropertyNTPTiling; |
| 319 return true; | 312 return true; |
| 320 case NTP_LOGO_ALTERNATE: | 313 case NTP_LOGO_ALTERNATE: |
| 321 *result = kDefaultDisplayPropertyNTPInverseLogo; | 314 *result = kDefaultDisplayPropertyNTPInverseLogo; |
| 322 return true; | 315 return true; |
| 323 } | 316 } |
| 324 | 317 |
| 325 return false; | 318 return false; |
| 326 } | 319 } |
| OLD | NEW |