| 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 25 matching lines...) Expand all Loading... |
| 36 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201); | 36 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201); |
| 37 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); | 37 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); |
| 38 #endif // OS_CHROMEOS | 38 #endif // OS_CHROMEOS |
| 39 | 39 |
| 40 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be | 40 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be |
| 41 // removed when we stop supporting pre-MD. | 41 // removed when we stop supporting pre-MD. |
| 42 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
| 43 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4), | 43 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4), |
| 44 SkColorSetRGB(0x28, 0x2B, 0x2D)}; | 44 SkColorSetRGB(0x28, 0x2B, 0x2D)}; |
| 45 const SkColor kDefaultColorFrameIncognitoInactive[] = { | 45 const SkColor kDefaultColorFrameIncognitoInactive[] = { |
| 46 SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x14, 0x17, 0x19)}; | 46 SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x38, 0x3B, 0x3D)}; |
| 47 #else | 47 #else |
| 48 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(83, 106, 139), | 48 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(83, 106, 139), |
| 49 SkColorSetRGB(0x28, 0x2B, 0x2D)}; | 49 SkColorSetRGB(0x28, 0x2B, 0x2D)}; |
| 50 const SkColor kDefaultColorFrameIncognitoInactive[] = { | 50 const SkColor kDefaultColorFrameIncognitoInactive[] = { |
| 51 SkColorSetRGB(126, 139, 156), SkColorSetRGB(0x14, 0x17, 0x19)}; | 51 SkColorSetRGB(126, 139, 156), SkColorSetRGB(0x38, 0x3B, 0x3D)}; |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 #if defined(OS_MACOSX) | 54 #if defined(OS_MACOSX) |
| 55 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); | 55 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); |
| 56 #else | 56 #else |
| 57 const SkColor kDefaultColorToolbar[] = { | 57 const SkColor kDefaultColorToolbar[] = { |
| 58 SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)}; | 58 SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)}; |
| 59 const SkColor kDefaultColorToolbarIncognito[] = { | 59 const SkColor kDefaultColorToolbarIncognito[] = { |
| 60 SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)}; | 60 SkColorSetRGB(223, 223, 223), SkColorSetRGB(0x50, 0x50, 0x50)}; |
| 61 #endif // OS_MACOSX | 61 #endif // OS_MACOSX |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 #endif | 358 #endif |
| 359 case COLOR_FRAME_INCOGNITO: | 359 case COLOR_FRAME_INCOGNITO: |
| 360 case COLOR_FRAME_INCOGNITO_INACTIVE: | 360 case COLOR_FRAME_INCOGNITO_INACTIVE: |
| 361 NOTREACHED() << "These values should be queried via their respective " | 361 NOTREACHED() << "These values should be queried via their respective " |
| 362 "non-incognito equivalents and an appropriate |otr| " | 362 "non-incognito equivalents and an appropriate |otr| " |
| 363 "value."; | 363 "value."; |
| 364 default: | 364 default: |
| 365 return gfx::kPlaceholderColor; | 365 return gfx::kPlaceholderColor; |
| 366 } | 366 } |
| 367 } | 367 } |
| OLD | NEW |