chrome/renderer/safe_browsing/phishing_thumbnailer.cc - Issue 6312156: Change includes of gfx/* to ui/gfx/*

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: chrome/renderer/safe_browsing/phishing_thumbnailer.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/renderer/safe_browsing/phishing_thumbnailer.h"	5 #include "chrome/renderer/safe_browsing/phishing_thumbnailer.h"

6	6

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

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

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

10 #include "chrome/renderer/render_view.h"	10 #include "chrome/renderer/render_view.h"

11 #include "gfx/size.h"

12 #include "skia/ext/bitmap_platform_device.h"	11 #include "skia/ext/bitmap_platform_device.h"

13 #include "skia/ext/image_operations.h"	12 #include "skia/ext/image_operations.h"

14 #include "third_party/skia/include/core/SkBitmap.h"	13 #include "third_party/skia/include/core/SkBitmap.h"

15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"	14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"

16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"	15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"

17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"	16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"

18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

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

19 #include "webkit/glue/webkit_glue.h"	19 #include "webkit/glue/webkit_glue.h"

20	20

21 using WebKit::WebRect;	21 using WebKit::WebRect;

22 using WebKit::WebSize;	22 using WebKit::WebSize;

23 using WebKit::WebView;	23 using WebKit::WebView;

24	24

25 namespace safe_browsing {	25 namespace safe_browsing {

26	26

27 SkBitmap GrabPhishingThumbnail(RenderView* render_view,	27 SkBitmap GrabPhishingThumbnail(RenderView* render_view,

28 const gfx::Size& view_size,	28 const gfx::Size& view_size,

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 view->mainFrame()->setCanHaveScrollbars(	73 view->mainFrame()->setCanHaveScrollbars(

74 render_view->should_display_scrollbars(old_size.width, old_size.height));	74 render_view->should_display_scrollbars(old_size.width, old_size.height));

75 view->resize(old_size);	75 view->resize(old_size);

76	76

77 UMA_HISTOGRAM_TIMES("SBClientPhishing.GrabPhishingThumbnail",	77 UMA_HISTOGRAM_TIMES("SBClientPhishing.GrabPhishingThumbnail",

78 base::TimeTicks::Now() - beginning_time);	78 base::TimeTicks::Now() - beginning_time);

79 return thumbnail;	79 return thumbnail;

80 }	80 }

81	81

82 } // namespace safe_browsing	82 } // namespace safe_browsing

OLD	NEW