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

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

Issue 1863483005: [Mac] Use correct stroke color for toolbar top edge in Material Design. (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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 SkColorSetRGB(255, 0, 0), SkColorSetRGB(45, 45, 45)}; 140 SkColorSetRGB(255, 0, 0), SkColorSetRGB(45, 45, 45)};
141 const SkColor kDefaultColorTabBackgroundInactive[] = { 141 const SkColor kDefaultColorTabBackgroundInactive[] = {
142 SkColorSetRGB(255, 0, 0), SkColorSetRGB(236, 236, 236)}; 142 SkColorSetRGB(255, 0, 0), SkColorSetRGB(236, 236, 236)};
143 const SkColor kDefaultColorTabBackgroundInactiveIncognito[] = { 143 const SkColor kDefaultColorTabBackgroundInactiveIncognito[] = {
144 SkColorSetRGB(255, 0, 0), SkColorSetRGB(40, 40, 40)}; 144 SkColorSetRGB(255, 0, 0), SkColorSetRGB(40, 40, 40)};
145 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81); 145 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
146 const SkColor kDefaultColorToolbarButtonStrokeInactive = 146 const SkColor kDefaultColorToolbarButtonStrokeInactive =
147 SkColorSetARGB(75, 99, 99, 99); 147 SkColorSetARGB(75, 99, 99, 99);
148 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(204, 204, 204); 148 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(204, 204, 204);
149 const SkColor kDefaultColorToolbarStroke[] = { 149 const SkColor kDefaultColorToolbarStroke[] = {
150 SkColorSetRGB(103, 103, 103), SkColorSetARGB(37, 0, 0, 0)}; 150 SkColorSetRGB(103, 103, 103), SkColorSetARGB(76, 0, 0, 0)};
151 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(163, 163, 163); 151 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(163, 163, 163);
152 const SkColor kDefaultColorToolbarIncognitoStroke[] = { 152 const SkColor kDefaultColorToolbarIncognitoStroke[] = {
153 SkColorSetRGB(255, 0, 0), SkColorSetARGB(63, 0, 0, 0)}; 153 SkColorSetRGB(255, 0, 0), SkColorSetARGB(63, 0, 0, 0)};
154 const SkColor kDefaultColorToolbarStrokeTheme = 154 const SkColor kDefaultColorToolbarStrokeTheme =
155 SkColorSetARGB(102, 255, 255, 255); 155 SkColorSetARGB(102, 255, 255, 255);
156 const SkColor kDefaultColorToolbarStrokeThemeInactive = 156 const SkColor kDefaultColorToolbarStrokeThemeInactive =
157 SkColorSetARGB(102, 76, 76, 76); 157 SkColorSetARGB(102, 76, 76, 76);
158 #endif // OS_MACOSX 158 #endif // OS_MACOSX
159 // ---------------------------------------------------------------------------- 159 // ----------------------------------------------------------------------------
160 160
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 #endif 377 #endif
378 case COLOR_FRAME_INCOGNITO: 378 case COLOR_FRAME_INCOGNITO:
379 case COLOR_FRAME_INCOGNITO_INACTIVE: 379 case COLOR_FRAME_INCOGNITO_INACTIVE:
380 NOTREACHED() << "These values should be queried via their respective " 380 NOTREACHED() << "These values should be queried via their respective "
381 "non-incognito equivalents and an appropriate |otr| " 381 "non-incognito equivalents and an appropriate |otr| "
382 "value."; 382 "value.";
383 default: 383 default:
384 return gfx::kPlaceholderColor; 384 return gfx::kPlaceholderColor;
385 } 385 }
386 } 386 }
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