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

Unified Diff: content/shell/renderer/test_runner/test_runner.cc

Issue 280953002: Content side of languagechange event fired on accept languages changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change accept languages default to empty string for tests 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
Index: content/shell/renderer/test_runner/test_runner.cc
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc
index 981ca526b2d18acbc6d031353a488e3662d974f6..dca6cdd06021eab6afdecef15679a0961e9b237a 100644
--- a/content/shell/renderer/test_runner/test_runner.cc
+++ b/content/shell/renderer/test_runner/test_runner.cc
@@ -184,6 +184,7 @@ class TestRunnerBindings : public gin::Wrappable<TestRunnerBindings> {
void SetAllowUniversalAccessFromFileURLs(bool allow);
void SetAllowFileAccessFromFileURLs(bool allow);
void OverridePreference(const std::string key, v8::Handle<v8::Value> value);
+ void SetAcceptLanguages(const std::string& accept_languages);
void SetPluginsEnabled(bool enabled);
void DumpEditingCallbacks();
void DumpAsText();
@@ -383,6 +384,7 @@ gin::ObjectTemplateBuilder TestRunnerBindings::GetObjectTemplateBuilder(
.SetMethod("setAllowFileAccessFromFileURLs",
&TestRunnerBindings::SetAllowFileAccessFromFileURLs)
.SetMethod("overridePreference", &TestRunnerBindings::OverridePreference)
+ .SetMethod("setAcceptLanguages", &TestRunnerBindings::SetAcceptLanguages)
.SetMethod("setPluginsEnabled", &TestRunnerBindings::SetPluginsEnabled)
.SetMethod("dumpEditingCallbacks",
&TestRunnerBindings::DumpEditingCallbacks)
@@ -920,6 +922,14 @@ void TestRunnerBindings::OverridePreference(const std::string key,
runner_->OverridePreference(key, value);
}
+void TestRunnerBindings::SetAcceptLanguages(
+ const std::string& accept_languages) {
+ if (!runner_)
+ return;
+
+ runner_->SetAcceptLanguages(accept_languages);
+}
+
void TestRunnerBindings::SetPluginsEnabled(bool enabled) {
if (runner_)
runner_->SetPluginsEnabled(enabled);
@@ -2322,6 +2332,10 @@ void TestRunner::OverridePreference(const std::string key,
delegate_->applyPreferences();
}
+void TestRunner::SetAcceptLanguages(const std::string& accept_languages) {
+ proxy_->SetAcceptLanguages(accept_languages);
+}
+
void TestRunner::SetPluginsEnabled(bool enabled) {
delegate_->preferences()->plugins_enabled = enabled;
delegate_->applyPreferences();
« no previous file with comments | « content/shell/renderer/test_runner/test_runner.h ('k') | content/shell/renderer/test_runner/web_test_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698