ui/base/native_theme/native_theme_base.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/base/native_theme/native_theme_base.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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 | Annotate | Revision Log

« no previous file with comments | « ui/base/native_theme/native_theme_aura.cc ('k') | ui/base/strings/ui_strings.gyp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "ui/base/native_theme/native_theme_base.h"	5 #include "ui/base/native_theme/native_theme_base.h"

6	6

7 #include <limits>	7 #include <limits>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "grit/ui_resources_standard.h"	11 #include "grit/ui_resources.h"

12 #include "third_party/skia/include/effects/SkGradientShader.h"	12 #include "third_party/skia/include/effects/SkGradientShader.h"

13 #include "ui/base/layout.h"	13 #include "ui/base/layout.h"

14 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

15 #include "ui/base/ui_base_switches.h"	15 #include "ui/base/ui_base_switches.h"

16 #include "ui/gfx/canvas.h"	16 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/color_utils.h"	17 #include "ui/gfx/color_utils.h"

18 #include "ui/gfx/image/image_skia.h"	18 #include "ui/gfx/image/image_skia.h"

19 #include "ui/gfx/rect.h"	19 #include "ui/gfx/rect.h"

20 #include "ui/gfx/size.h"	20 #include "ui/gfx/size.h"

21 #include "ui/gfx/skia_util.h"	21 #include "ui/gfx/skia_util.h"

(...skipping 1095 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1117 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);	1117 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);

1118 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);	1118 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);

1119	1119

1120 if (hsv1[2] + hsv2[2] > 1.0)	1120 if (hsv1[2] + hsv2[2] > 1.0)

1121 diff = -diff;	1121 diff = -diff;

1122	1122

1123 return SaturateAndBrighten(hsv2, -0.2f, diff);	1123 return SaturateAndBrighten(hsv2, -0.2f, diff);

1124 }	1124 }

1125	1125

1126 } // namespace ui	1126 } // namespace ui

OLD	NEW