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

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

Issue 217183004: Migrate addMessageToConsole API to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + fix the test_runner 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 | « content/renderer/render_view_impl.cc ('k') | 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/WebTestProxy.h" 9 #include "content/shell/renderer/test_runner/WebTestProxy.h"
10 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
(...skipping 24 matching lines...) Expand all
35 35
36 blink::WebPlugin* createPlugin(blink::WebFrame* frame, const blink::WebPlugi nParams& params) 36 blink::WebPlugin* createPlugin(blink::WebFrame* frame, const blink::WebPlugi nParams& params)
37 { 37 {
38 blink::WebPlugin* plugin = m_baseProxy->createPlugin(frame, params); 38 blink::WebPlugin* plugin = m_baseProxy->createPlugin(frame, params);
39 if (plugin) 39 if (plugin)
40 return plugin; 40 return plugin;
41 return Base::createPlugin(frame, params); 41 return Base::createPlugin(frame, params);
42 } 42 }
43 43
44 // WebFrameClient implementation. 44 // WebFrameClient implementation.
45 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, const blink::WebString& sourceName, unsigned sourceLine, const blink::WebString & stackTrace)
46 {
47 m_baseProxy->didAddMessageToConsole(message, sourceName, sourceLine);
48 Base::didAddMessageToConsole(message, sourceName, sourceLine, stackTrace );
49 }
45 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType ) 50 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType )
46 { 51 {
47 using blink::WebString; 52 using blink::WebString;
48 53
49 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer")); 54 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer"));
50 return mimeType.utf8().find(suffix.utf8()) != std::string::npos; 55 return mimeType.utf8().find(suffix.utf8()) != std::string::npos;
51 } 56 }
52 virtual void didStartProvisionalLoad(blink::WebFrame* frame) 57 virtual void didStartProvisionalLoad(blink::WebFrame* frame)
53 { 58 {
54 if (m_version > 2) 59 if (m_version > 2)
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // It is used instead of a #define and is set by layouttest_support when 178 // It is used instead of a #define and is set by layouttest_support when
174 // creating this object. 179 // creating this object.
175 int m_version; 180 int m_version;
176 181
177 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 182 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
178 }; 183 };
179 184
180 } 185 }
181 186
182 #endif // WebTestProxy_h 187 #endif // WebTestProxy_h
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/shell/renderer/test_runner/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698