Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Side by Side Diff: webkit/tools/test_shell/test_shell_mac.mm

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 | « webkit/tools/test_shell/test_shell.cc ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 <ApplicationServices/ApplicationServices.h> 5 #include <ApplicationServices/ApplicationServices.h>
6 #import <Cocoa/Cocoa.h> 6 #import <Cocoa/Cocoa.h>
7 #import <objc/objc-runtime.h> 7 #import <objc/objc-runtime.h>
8 #include <sys/stat.h> 8 #include <sys/stat.h>
9 9
10 #include "webkit/tools/test_shell/test_shell.h" 10 #include "webkit/tools/test_shell/test_shell.h"
11 11
12 #include "base/base_paths.h" 12 #include "base/base_paths.h"
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/debug/debugger.h" 14 #include "base/debug/debugger.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/mac/mac_util.h" 18 #include "base/mac/mac_util.h"
19 #include "base/memory_debug.h" 19 #include "base/memory_debug.h"
20 #include "base/message_loop.h" 20 #include "base/message_loop.h"
21 #include "base/path_service.h" 21 #include "base/path_service.h"
22 #include "base/string16.h" 22 #include "base/string16.h"
23 #include "base/string_piece.h" 23 #include "base/string_piece.h"
24 #include "base/utf_string_conversions.h" 24 #include "base/utf_string_conversions.h"
25 #include "gfx/size.h"
26 #include "grit/webkit_resources.h" 25 #include "grit/webkit_resources.h"
27 #include "net/base/mime_util.h" 26 #include "net/base/mime_util.h"
28 #include "skia/ext/bitmap_platform_device.h" 27 #include "skia/ext/bitmap_platform_device.h"
29 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
32 #include "ui/base/resource/data_pack.h" 31 #include "ui/base/resource/data_pack.h"
32 #include "ui/gfx/size.h"
33 #include "webkit/glue/webkit_glue.h" 33 #include "webkit/glue/webkit_glue.h"
34 #include "webkit/glue/webpreferences.h" 34 #include "webkit/glue/webpreferences.h"
35 #include "webkit/plugins/npapi/plugin_list.h" 35 #include "webkit/plugins/npapi/plugin_list.h"
36 #include "webkit/tools/test_shell/mac/test_shell_webview.h" 36 #include "webkit/tools/test_shell/mac/test_shell_webview.h"
37 #include "webkit/tools/test_shell/resource.h" 37 #include "webkit/tools/test_shell/resource.h"
38 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 38 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
39 #include "webkit/tools/test_shell/test_navigation_controller.h" 39 #include "webkit/tools/test_shell/test_navigation_controller.h"
40 #include "webkit/tools/test_shell/test_webview_delegate.h" 40 #include "webkit/tools/test_shell/test_webview_delegate.h"
41 41
42 #include "third_party/skia/include/core/SkBitmap.h" 42 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 return false; 734 return false;
735 } 735 }
736 736
737 void DidLoadPlugin(const std::string& filename) { 737 void DidLoadPlugin(const std::string& filename) {
738 } 738 }
739 739
740 void DidUnloadPlugin(const std::string& filename) { 740 void DidUnloadPlugin(const std::string& filename) {
741 } 741 }
742 742
743 } // namespace webkit_glue 743 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.cc ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698