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

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

Issue 1019023002: MacViews: Implement non-client frame view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wrench-menu
Patch Set: Use Yosemite colors Created 5 years, 9 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 | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | 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/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"
11 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
12 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
13 13
14 namespace { 14 namespace {
15 15
16 // ---------------------------------------------------------------------------- 16 // ----------------------------------------------------------------------------
17 // Defaults for properties which are stored in the browser theme pack. If you 17 // Defaults for properties which are stored in the browser theme pack. If you
18 // change these defaults, you must increment the version number in 18 // change these defaults, you must increment the version number in
19 // browser_theme_pack.h 19 // browser_theme_pack.h
20 20
21 // Default colors. 21 // Default colors.
22 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
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 #elif defined(OS_MACOSX)
27 const SkColor kDefaultColorFrame = SkColorSetRGB(224, 224, 224);
28 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(246, 246, 246);
26 #else 29 #else
27 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201); 30 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
28 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228); 31 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
29 #endif // OS_CHROMEOS 32 #endif // OS_CHROMEOS
30 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139); 33 const SkColor kDefaultColorFrameIncognito = SkColorSetRGB(83, 106, 139);
31 const SkColor kDefaultColorFrameIncognitoInactive = 34 const SkColor kDefaultColorFrameIncognitoInactive =
32 SkColorSetRGB(126, 139, 156); 35 SkColorSetRGB(126, 139, 156);
33 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
34 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230); 37 const SkColor kDefaultColorToolbar = SkColorSetRGB(230, 230, 230);
35 #else 38 #else
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 case NTP_BACKGROUND_ALIGNMENT: 304 case NTP_BACKGROUND_ALIGNMENT:
302 return kDefaultDisplayPropertyNTPAlignment; 305 return kDefaultDisplayPropertyNTPAlignment;
303 case NTP_BACKGROUND_TILING: 306 case NTP_BACKGROUND_TILING:
304 return kDefaultDisplayPropertyNTPTiling; 307 return kDefaultDisplayPropertyNTPTiling;
305 case NTP_LOGO_ALTERNATE: 308 case NTP_LOGO_ALTERNATE:
306 return kDefaultDisplayPropertyNTPAlternateLogo; 309 return kDefaultDisplayPropertyNTPAlternateLogo;
307 } 310 }
308 311
309 return -1; 312 return -1;
310 } 313 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_non_client_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698