ui/native_theme/native_theme_win.cc - Issue 1492353002: Consolidate Windows bitmap and DC code

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

Unified Diff: ui/native_theme/native_theme_win.cc

Issue 1492353002: Consolidate Windows bitmap and DC code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-printing-dc-from-device

Patch Set: fix bad merge Created 4 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 side-by-side diff with in-line comments

Download patch

Index: ui/native_theme/native_theme_win.cc

diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc

index b683cdfb78807d3a1b7c63442997f9b11f780912..faf21d3ef1b436f71655b40b86654e1c74a674f7 100644

--- a/ui/native_theme/native_theme_win.cc

+++ b/ui/native_theme/native_theme_win.cc

@@ -16,17 +16,16 @@

#include "base/win/scoped_hdc.h"

#include "base/win/scoped_select_object.h"

#include "base/win/windows_version.h"

-#include "skia/ext/bitmap_platform_device.h"

#include "skia/ext/platform_canvas.h"

#include "skia/ext/skia_utils_win.h"

#include "third_party/skia/include/core/SkCanvas.h"

#include "third_party/skia/include/core/SkColor.h"

+#include "third_party/skia/include/core/SkPath.h"

#include "third_party/skia/include/core/SkShader.h"

#include "ui/base/material_design/material_design_controller.h"

#include "ui/display/win/dpi.h"

#include "ui/gfx/color_palette.h"

#include "ui/gfx/color_utils.h"

-#include "ui/gfx/gdi_util.h"

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

#include "ui/gfx/geometry/rect_conversions.h"

#include "ui/gfx/skia_util.h"

« no previous file with comments | « ui/gfx/icon_util.cc ('k') | no next file » | no next file with comments »