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

Side by Side Diff: webkit/support/test_webkit_client.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: removed some too general ifdefs and ppapi changes Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "webkit/support/test_webkit_client.h" 5 #include "webkit/support/test_webkit_client.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/metrics/stats_counters.h" 8 #include "base/metrics/stats_counters.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "webkit/tools/test_shell/simple_appcache_system.h" 48 #include "webkit/tools/test_shell/simple_appcache_system.h"
49 #include "webkit/tools/test_shell/simple_file_system.h" 49 #include "webkit/tools/test_shell/simple_file_system.h"
50 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 50 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
51 #include "webkit/tools/test_shell/simple_webcookiejar_impl.h" 51 #include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
52 #include "webkit/tools/test_shell/test_shell_request_context.h" 52 #include "webkit/tools/test_shell/test_shell_request_context.h"
53 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h" 53 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
54 54
55 #if defined(OS_WIN) 55 #if defined(OS_WIN)
56 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebThemeEngine.h" 56 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebThemeEngine.h"
57 #include "webkit/tools/test_shell/test_shell_webthemeengine.h" 57 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
58 #elif defined(OS_LINUX)
59 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebThemeEngine. h"
60 #elif defined(OS_MACOSX) 58 #elif defined(OS_MACOSX)
61 #include "base/mac/mac_util.h" 59 #include "base/mac/mac_util.h"
60 #elif defined(OS_POSIX)
61 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebThemeEngine. h"
62 #endif 62 #endif
63 63
64 using WebKit::WebScriptController; 64 using WebKit::WebScriptController;
65 65
66 TestWebKitClient::TestWebKitClient(bool unit_test_mode) 66 TestWebKitClient::TestWebKitClient(bool unit_test_mode)
67 : unit_test_mode_(unit_test_mode) { 67 : unit_test_mode_(unit_test_mode) {
68 v8::V8::SetCounterFunction(base::StatsTable::FindLocation); 68 v8::V8::SetCounterFunction(base::StatsTable::FindLocation);
69 69
70 WebKit::initialize(this); 70 WebKit::initialize(this);
71 WebKit::setLayoutTestMode(true); 71 WebKit::setLayoutTestMode(true);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 switch (webkit_support::GetGraphicsContext3DImplementation()) { 356 switch (webkit_support::GetGraphicsContext3DImplementation()) {
357 case webkit_support::IN_PROCESS: 357 case webkit_support::IN_PROCESS:
358 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); 358 return new webkit::gpu::WebGraphicsContext3DInProcessImpl();
359 case webkit_support::IN_PROCESS_COMMAND_BUFFER: 359 case webkit_support::IN_PROCESS_COMMAND_BUFFER:
360 return new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl(); 360 return new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl();
361 default: 361 default:
362 CHECK(false) << "Unknown GraphicsContext3D Implementation"; 362 CHECK(false) << "Unknown GraphicsContext3D Implementation";
363 return NULL; 363 return NULL;
364 } 364 }
365 } 365 }
OLDNEW
« ui/gfx/native_widget_types.h ('K') | « webkit/plugins/ppapi/ppb_flash_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698