| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index f183f91cc765774be96018d7bf11cfbc1ed2c4cb..9632396d79f4590d601db836b2392a21003fa7d8 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -19,6 +19,7 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| +#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
| #include "chrome/browser/browser_about_handler.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_shutdown.h"
|
| @@ -2277,6 +2278,16 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
|
| web_prefs->hyperlink_auditing_enabled =
|
| prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
|
|
|
| + std::string image_animation_policy =
|
| + prefs->GetString(prefs::kAnimationPolicy);
|
| + if (image_animation_policy == kAnimationPolicyOnce)
|
| + web_prefs->animation_policy =
|
| + content::IMAGE_ANIMATION_POLICY_ANIMATION_ONCE;
|
| + else if (image_animation_policy == kAnimationPolicyNone)
|
| + web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_NO_ANIMATION;
|
| + else
|
| + web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_ALLOWED;
|
| +
|
| // Make sure we will set the default_encoding with canonical encoding name.
|
| web_prefs->default_encoding =
|
| CharacterEncoding::GetCanonicalEncodingNameByAliasName(
|
|
|