Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: chrome/browser/themes/theme_properties.cc

Issue 1862923002: Lighten incognito frame when inactive, instead of darkening it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 24 matching lines...) Expand all
35 const SkColor kDefaultColorFrameInactive[] = { 35 const SkColor kDefaultColorFrameInactive[] = {
36 SkColorSetRGB(0xCD, 0xCD, 0xCE), SkColorSetRGB(220, 220, 220)}; 36 SkColorSetRGB(0xCD, 0xCD, 0xCE), SkColorSetRGB(220, 220, 220)};
37 #endif 37 #endif
38 38
39 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be 39 // These colors are the same between CrOS and !CrOS for MD, so this ifdef can be
40 // removed when we stop supporting pre-MD. 40 // removed when we stop supporting pre-MD.
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4), 42 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(0xA0, 0xA0, 0xA4),
43 SkColorSetRGB(0x28, 0x2B, 0x2D)}; 43 SkColorSetRGB(0x28, 0x2B, 0x2D)};
44 const SkColor kDefaultColorFrameIncognitoInactive[] = { 44 const SkColor kDefaultColorFrameIncognitoInactive[] = {
45 SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x14, 0x17, 0x19)}; 45 SkColorSetRGB(0xAA, 0xAA, 0xAE), SkColorSetRGB(0x38, 0x3B, 0x3D)};
46 #elif defined(OS_MACOSX) 46 #elif defined(OS_MACOSX)
47 const SkColor kDefaultColorFrameIncognito[] = { 47 const SkColor kDefaultColorFrameIncognito[] = {
48 SkColorSetRGB(255, 0, 0), SkColorSetARGB(230, 20, 22, 24)}; 48 SkColorSetRGB(255, 0, 0), SkColorSetARGB(230, 20, 22, 24)};
49 const SkColor kDefaultColorFrameIncognitoInactive[] = { 49 const SkColor kDefaultColorFrameIncognitoInactive[] = {
50 SkColorSetRGB(255, 0, 0), SkColorSetRGB(30, 30, 30)}; 50 SkColorSetRGB(255, 0, 0), SkColorSetRGB(30, 30, 30)};
51 #else 51 #else
52 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(83, 106, 139), 52 const SkColor kDefaultColorFrameIncognito[] = {SkColorSetRGB(83, 106, 139),
53 SkColorSetRGB(0x28, 0x2B, 0x2D)}; 53 SkColorSetRGB(0x28, 0x2B, 0x2D)};
54 const SkColor kDefaultColorFrameIncognitoInactive[] = { 54 const SkColor kDefaultColorFrameIncognitoInactive[] = {
55 SkColorSetRGB(126, 139, 156), SkColorSetRGB(0x14, 0x17, 0x19)}; 55 SkColorSetRGB(126, 139, 156), SkColorSetRGB(0x38, 0x3B, 0x3D)};
56 #endif 56 #endif
57 57
58 #if defined(OS_MACOSX) 58 #if defined(OS_MACOSX)
59 const SkColor kDefaultColorToolbar[] = { 59 const SkColor kDefaultColorToolbar[] = {
60 SkColorSetRGB(230, 230, 230), SkColorSetRGB(242, 242, 242)}; 60 SkColorSetRGB(230, 230, 230), SkColorSetRGB(242, 242, 242)};
61 const SkColor kDefaultColorToolbarIncognito[] = { 61 const SkColor kDefaultColorToolbarIncognito[] = {
62 SkColorSetRGB(230, 230, 230), SkColorSetRGB(0x50, 0x50, 0x50)}; 62 SkColorSetRGB(230, 230, 230), SkColorSetRGB(0x50, 0x50, 0x50)};
63 #else 63 #else
64 const SkColor kDefaultColorToolbar[] = { 64 const SkColor kDefaultColorToolbar[] = {
65 SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)}; 65 SkColorSetRGB(223, 223, 223), SkColorSetRGB(242, 242, 242)};
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 #endif 378 #endif
379 case COLOR_FRAME_INCOGNITO: 379 case COLOR_FRAME_INCOGNITO:
380 case COLOR_FRAME_INCOGNITO_INACTIVE: 380 case COLOR_FRAME_INCOGNITO_INACTIVE:
381 NOTREACHED() << "These values should be queried via their respective " 381 NOTREACHED() << "These values should be queried via their respective "
382 "non-incognito equivalents and an appropriate |otr| " 382 "non-incognito equivalents and an appropriate |otr| "
383 "value."; 383 "value.";
384 default: 384 default:
385 return gfx::kPlaceholderColor; 385 return gfx::kPlaceholderColor;
386 } 386 }
387 } 387 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698