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

Unified Diff: chrome/browser/ui/webui/web_ui_test_handler.cc

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/browser/ui/webui/workers_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/web_ui_test_handler.cc
===================================================================
--- chrome/browser/ui/webui/web_ui_test_handler.cc (revision 116011)
+++ chrome/browser/ui/webui/web_ui_test_handler.cc (working copy)
@@ -11,10 +11,10 @@
#include "chrome/common/render_messages.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/browser/web_contents.h"
WebUITestHandler::WebUITestHandler()
: test_done_(false),
@@ -33,14 +33,14 @@
}
void WebUITestHandler::RunJavaScript(const string16& js_text) {
- web_ui()->tab_contents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
+ web_ui()->web_contents()->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
string16(), js_text);
}
bool WebUITestHandler::RunJavaScriptTestWithResult(const string16& js_text) {
test_succeeded_ = false;
run_test_succeeded_ = false;
- RenderViewHost* rvh = web_ui()->tab_contents()->GetRenderViewHost();
+ RenderViewHost* rvh = web_ui()->web_contents()->GetRenderViewHost();
content::NotificationRegistrar notification_registrar;
notification_registrar.Add(
this, content::NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
« no previous file with comments | « chrome/browser/ui/webui/web_ui_browsertest.cc ('k') | chrome/browser/ui/webui/workers_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698