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

Side by Side Diff: content/shell/renderer/webkit_test_runner.cc

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new location for public/platform Created 7 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/shell/renderer/webkit_test_runner.h" 5 #include "content/shell/renderer/webkit_test_runner.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <clocale> 8 #include <clocale>
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 50 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h" 51 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h" 52 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h"
53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 53 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
54 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Task.h" 54 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web Task.h"
55 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestInterfaces.h" 55 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestInterfaces.h"
56 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h" 56 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h"
57 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestRunner.h" 57 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestRunner.h"
58 #include "ui/gfx/rect.h" 58 #include "ui/gfx/rect.h"
59 #include "webkit/base/file_path_string_conversions.h" 59 #include "webkit/base/file_path_string_conversions.h"
60 #include "webkit/common/webpreferences.h"
60 #include "webkit/glue/webkit_glue.h" 61 #include "webkit/glue/webkit_glue.h"
61 #include "webkit/glue/webpreferences.h"
62 #include "webkit/mocks/test_media_stream_client.h" 62 #include "webkit/mocks/test_media_stream_client.h"
63 63
64 using WebKit::Platform; 64 using WebKit::Platform;
65 using WebKit::WebArrayBufferView; 65 using WebKit::WebArrayBufferView;
66 using WebKit::WebContextMenuData; 66 using WebKit::WebContextMenuData;
67 using WebKit::WebDevToolsAgent; 67 using WebKit::WebDevToolsAgent;
68 using WebKit::WebDeviceOrientation; 68 using WebKit::WebDeviceOrientation;
69 using WebKit::WebElement; 69 using WebKit::WebElement;
70 using WebKit::WebFrame; 70 using WebKit::WebFrame;
71 using WebKit::WebGamepads; 71 using WebKit::WebGamepads;
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 ->loadRequest(WebURLRequest(GURL("about:blank"))); 710 ->loadRequest(WebURLRequest(GURL("about:blank")));
711 Send(new ShellViewHostMsg_ResetDone(routing_id())); 711 Send(new ShellViewHostMsg_ResetDone(routing_id()));
712 } 712 }
713 713
714 void WebKitTestRunner::OnNotifyDone() { 714 void WebKitTestRunner::OnNotifyDone() {
715 render_view()->GetWebView()->mainFrame()->executeScript( 715 render_view()->GetWebView()->mainFrame()->executeScript(
716 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();"))); 716 WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
717 } 717 }
718 718
719 } // namespace content 719 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/webkit_test_helpers.cc ('k') | content/shell/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698