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

Side by Side Diff: chrome/renderer/render_view_browsertest.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

« no previous file with comments | « chrome/renderer/render_view.cc ('k') | chrome/renderer/render_widget.h » ('j') | no next file with comments »

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 "base/basictypes.h"	5 #include "base/basictypes.h"

6	6

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

8 #include "base/shared_memory.h"	8 #include "base/shared_memory.h"

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

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

11 #include "chrome/common/autofill_messages.h"	11 #include "chrome/common/autofill_messages.h"

12 #include "chrome/common/content_settings.h"	12 #include "chrome/common/content_settings.h"

13 #include "chrome/common/native_web_keyboard_event.h"	13 #include "chrome/common/native_web_keyboard_event.h"

14 #include "chrome/common/render_messages.h"	14 #include "chrome/common/render_messages.h"

15 #include "chrome/common/render_messages_params.h"	15 #include "chrome/common/render_messages_params.h"

16 #include "chrome/renderer/autofill/autofill_agent.h"	16 #include "chrome/renderer/autofill/autofill_agent.h"

17 #include "chrome/renderer/print_web_view_helper.h"	17 #include "chrome/renderer/print_web_view_helper.h"

18 #include "chrome/test/render_view_test.h"	18 #include "chrome/test/render_view_test.h"

19 #include "gfx/codec/jpeg_codec.h"

20 #include "net/base/net_errors.h"	19 #include "net/base/net_errors.h"

21 #include "printing/image.h"	20 #include "printing/image.h"

22 #include "printing/native_metafile.h"	21 #include "printing/native_metafile.h"

23 #include "testing/gtest/include/gtest/gtest.h"	22 #include "testing/gtest/include/gtest/gtest.h"

24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"	23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"

25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"	24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"

26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"	25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"

27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"	26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"

28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

29 #include "ui/base/keycodes/keyboard_codes.h"	28 #include "ui/base/keycodes/keyboard_codes.h"

	29 #include "ui/gfx/codec/jpeg_codec.h"

30 #include "webkit/glue/form_data.h"	30 #include "webkit/glue/form_data.h"

31 #include "webkit/glue/form_field.h"	31 #include "webkit/glue/form_field.h"

32 #include "webkit/glue/web_io_operators.h"	32 #include "webkit/glue/web_io_operators.h"

33	33

34 using WebKit::WebDocument;	34 using WebKit::WebDocument;

35 using WebKit::WebFrame;	35 using WebKit::WebFrame;

36 using WebKit::WebInputElement;	36 using WebKit::WebInputElement;

37 using WebKit::WebString;	37 using WebKit::WebString;

38 using WebKit::WebTextDirection;	38 using WebKit::WebTextDirection;

39 using WebKit::WebURLError;	39 using WebKit::WebURLError;

(...skipping 1170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1210 LoadHTML("<html><head><meta http-equiv=\"content-language\" "	1210 LoadHTML("<html><head><meta http-equiv=\"content-language\" "

1211 "content=\" fr , es,en \">"	1211 "content=\" fr , es,en \">"

1212 "</head><body>A random page with random content.</body></html>");	1212 "</head><body>A random page with random content.</body></html>");

1213 ProcessPendingMessages();	1213 ProcessPendingMessages();

1214 message = render_thread_.sink().GetUniqueMessageMatching(	1214 message = render_thread_.sink().GetUniqueMessageMatching(

1215 ViewHostMsg_PageContents::ID);	1215 ViewHostMsg_PageContents::ID);

1216 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);	1216 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);

1217 ViewHostMsg_PageContents::Read(message, &params);	1217 ViewHostMsg_PageContents::Read(message, &params);

1218 EXPECT_EQ("fr", params.d);	1218 EXPECT_EQ("fr", params.d);

1219 }	1219 }

OLD	NEW