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

Side by Side Diff: chrome/browser/ui/chrome_style.cc

Issue 2248103002: Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Properly handle incognito browsing Created 4 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/chrome_style.h" 5 #include "chrome/browser/ui/chrome_style.h"
6 6
7 #include "chrome/browser/themes/theme_properties.h" 7 #include "chrome/browser/themes/theme_properties.h"
8 #include "third_party/skia/include/core/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 #include "ui/gfx/image/image.h" 9 #include "ui/gfx/image/image.h"
10 #include "ui/resources/grit/ui_resources.h" 10 #include "ui/resources/grit/ui_resources.h"
11 11
12 namespace chrome_style { 12 namespace chrome_style {
13 13
14 int GetCloseButtonSize() { 14 int GetCloseButtonSize() {
15 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 15 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
16 const SkBitmap* image = rb.GetNativeImageNamed(IDR_CLOSE_DIALOG).ToSkBitmap(); 16 const SkBitmap* image = rb.GetNativeImageNamed(IDR_CLOSE_DIALOG).ToSkBitmap();
17 DCHECK_EQ(image->width(), image->height()); 17 DCHECK_EQ(image->width(), image->height());
18 return image->width(); 18 return image->width();
19 } 19 }
20 20
21 SkColor GetBackgroundColor() { 21 SkColor GetBackgroundColor() {
22 return ThemeProperties::GetDefaultColor( 22 return ThemeProperties::GetDefaultColor(ThemeProperties::COLOR_NTP_BACKGROUND,
23 ThemeProperties::COLOR_CONTROL_BACKGROUND, false); 23 false);
24 } 24 }
25 25
26 SkColor GetLinkColor() { 26 SkColor GetLinkColor() {
27 return SkColorSetRGB(0x11, 0x55, 0xCC); 27 return SkColorSetRGB(0x11, 0x55, 0xCC);
28 } 28 }
29 29
30 } // namespace chrome_style 30 } // namespace chrome_style
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698