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

Side by Side Diff: content/shell/renderer/test_runner/WebFrameTestProxy.h

Issue 200663002: Add 'waitUntilExternalURLLoad' method to TestRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extra whitespace Created 6 years, 8 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 | « no previous file | content/shell/renderer/test_runner/WebTestProxy.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/test_runner.h" 9 #include "content/shell/renderer/test_runner/test_runner.h"
10 #include "content/shell/renderer/test_runner/TestInterfaces.h" 10 #include "content/shell/renderer/test_runner/TestInterfaces.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 m_baseProxy->didAddMessageToConsole(message, sourceName, sourceLine); 44 m_baseProxy->didAddMessageToConsole(message, sourceName, sourceLine);
45 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace ); 45 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace );
46 } 46 }
47 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType ) 47 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType )
48 { 48 {
49 using blink::WebString; 49 using blink::WebString;
50 50
51 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer")); 51 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer"));
52 return mimeType.utf8().find(suffix.utf8()) != std::string::npos; 52 return mimeType.utf8().find(suffix.utf8()) != std::string::npos;
53 } 53 }
54 virtual void loadURLExternally(blink::WebLocalFrame* frame, const blink::Web URLRequest& request, blink::WebNavigationPolicy policy, const blink::WebString& suggested_name)
55 {
56 m_baseProxy->loadURLExternally(frame, request, policy, suggested_name);
57 Base::loadURLExternally(frame, request, policy, suggested_name);
58 }
54 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame) 59 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame)
55 { 60 {
56 m_baseProxy->didStartProvisionalLoad(frame); 61 m_baseProxy->didStartProvisionalLoad(frame);
57 Base::didStartProvisionalLoad(frame); 62 Base::didStartProvisionalLoad(frame);
58 } 63 }
59 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebLocalFrame * frame) 64 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebLocalFrame * frame)
60 { 65 {
61 m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame); 66 m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame);
62 Base::didReceiveServerRedirectForProvisionalLoad(frame); 67 Base::didReceiveServerRedirectForProvisionalLoad(frame);
63 } 68 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 216
212 private: 217 private:
213 WebTestProxyBase* m_baseProxy; 218 WebTestProxyBase* m_baseProxy;
214 219
215 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 220 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
216 }; 221 };
217 222
218 } // namespace content 223 } // namespace content
219 224
220 #endif // WebTestProxy_h 225 #endif // WebTestProxy_h
OLDNEW
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698