ui/gfx/native_theme_android.cc - Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.

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/gfx/native_theme_android.cc

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 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/gfx/native_theme_android.h ('k') | ui/gfx/native_theme_aura.h » ('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/gfx/native_theme_android.h"	5 #include "ui/gfx/native_theme_android.h"

6	6

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

8	8

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

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

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

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

797	797

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

799 diff = -diff;	799 diff = -diff;

800	800

801 return SaturateAndBrighten(hsv2, -0.2, diff);	801 return SaturateAndBrighten(hsv2, -0.2, diff);

802 }	802 }

803	803

804 } // namespace gfx	804 } // namespace gfx

OLD	NEW