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

Unified Diff: chrome/renderer/chrome_render_view_observer.cc

Issue 292313004: Port aria_util_test.js to run as a WebUI test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/test/base/web_ui_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_view_observer.cc
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index d292b3ed860523651df4c7c8840f13d1714af748..6bca11293b9b4ff5229ab9344c1c409cf4767630 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -256,7 +256,7 @@ bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
void ChromeRenderViewObserver::OnWebUIJavaScript(
const base::string16& javascript) {
- webui_javascript_ = javascript;
+ webui_javascript_.push_back(javascript);
}
#if defined(OS_ANDROID)
@@ -390,7 +390,10 @@ void ChromeRenderViewObserver::OnGetFPS() {
void ChromeRenderViewObserver::DidStartLoading() {
if ((render_view()->GetEnabledBindings() & content::BINDINGS_POLICY_WEB_UI) &&
!webui_javascript_.empty()) {
- render_view()->GetMainRenderFrame()->ExecuteJavaScript(webui_javascript_);
+ for (size_t i = 0; i < webui_javascript_.size(); ++i) {
+ render_view()->GetMainRenderFrame()->ExecuteJavaScript(
+ webui_javascript_[i]);
+ }
webui_javascript_.clear();
}
}
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/test/base/web_ui_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698