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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 785723002: Add new extension APIs related to animation policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use prefs_tab_helper. Created 5 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 break; 617 break;
618 } 618 }
619 NOTREACHED(); 619 NOTREACHED();
620 return content::PERMISSION_STATUS_DENIED; 620 return content::PERMISSION_STATUS_DENIED;
621 } 621 }
622 622
623 } // namespace 623 } // namespace
624 624
625 namespace chrome { 625 namespace chrome {
626 626
627 #if defined(ENABLE_EXTENSIONS)
628 const char kAnimationPolicyAllowed[] = "allowed";
Lei Zhang 2015/01/30 20:18:08 These probably should go in chrome/browser/accessi
je_julie(Not used) 2015/01/31 07:25:35 OK. I think I'd better add animation_policy_prefs
629 const char kAnimationPolicyOnce[] = "once";
630 const char kAnimationPolicyNone[] = "none";
631 #endif
632
627 ChromeContentBrowserClient::ChromeContentBrowserClient() 633 ChromeContentBrowserClient::ChromeContentBrowserClient()
628 : prerender_tracker_(NULL), 634 : prerender_tracker_(NULL),
629 weak_factory_(this) { 635 weak_factory_(this) {
630 #if defined(ENABLE_PLUGINS) 636 #if defined(ENABLE_PLUGINS)
631 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) 637 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
632 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); 638 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
633 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) 639 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
634 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); 640 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
635 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i) 641 for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
636 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]); 642 allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
(...skipping 1634 matching lines...) Expand 10 before | Expand all | Expand 10 after
2271 web_prefs->asynchronous_spell_checking_enabled = true; 2277 web_prefs->asynchronous_spell_checking_enabled = true;
2272 web_prefs->unified_textchecker_enabled = true; 2278 web_prefs->unified_textchecker_enabled = true;
2273 2279
2274 web_prefs->uses_universal_detector = 2280 web_prefs->uses_universal_detector =
2275 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector); 2281 prefs->GetBoolean(prefs::kWebKitUsesUniversalDetector);
2276 web_prefs->text_areas_are_resizable = 2282 web_prefs->text_areas_are_resizable =
2277 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable); 2283 prefs->GetBoolean(prefs::kWebKitTextAreasAreResizable);
2278 web_prefs->hyperlink_auditing_enabled = 2284 web_prefs->hyperlink_auditing_enabled =
2279 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing); 2285 prefs->GetBoolean(prefs::kEnableHyperlinkAuditing);
2280 2286
2287 #if defined(ENABLE_EXTENSIONS)
2288 std::string image_animation_policy =
2289 prefs->GetString(prefs::kAnimationPolicy);
2290 if (image_animation_policy == kAnimationPolicyOnce)
2291 web_prefs->animation_policy =
2292 content::IMAGE_ANIMATION_POLICY_ANIMATION_ONCE;
2293 else if (image_animation_policy == kAnimationPolicyNone)
2294 web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_NO_ANIMATION;
2295 else
2296 web_prefs->animation_policy = content::IMAGE_ANIMATION_POLICY_ALLOWED;
2297 #endif
2298
2281 // Make sure we will set the default_encoding with canonical encoding name. 2299 // Make sure we will set the default_encoding with canonical encoding name.
2282 web_prefs->default_encoding = 2300 web_prefs->default_encoding =
2283 CharacterEncoding::GetCanonicalEncodingNameByAliasName( 2301 CharacterEncoding::GetCanonicalEncodingNameByAliasName(
2284 web_prefs->default_encoding); 2302 web_prefs->default_encoding);
2285 if (web_prefs->default_encoding.empty()) { 2303 if (web_prefs->default_encoding.empty()) {
2286 prefs->ClearPref(prefs::kDefaultCharset); 2304 prefs->ClearPref(prefs::kDefaultCharset);
2287 web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset); 2305 web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
2288 } 2306 }
2289 DCHECK(!web_prefs->default_encoding.empty()); 2307 DCHECK(!web_prefs->default_encoding.empty());
2290 2308
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
2647 switches::kDisableWebRtcEncryption, 2665 switches::kDisableWebRtcEncryption,
2648 }; 2666 };
2649 to_command_line->CopySwitchesFrom(from_command_line, 2667 to_command_line->CopySwitchesFrom(from_command_line,
2650 kWebRtcDevSwitchNames, 2668 kWebRtcDevSwitchNames,
2651 arraysize(kWebRtcDevSwitchNames)); 2669 arraysize(kWebRtcDevSwitchNames));
2652 } 2670 }
2653 } 2671 }
2654 #endif // defined(ENABLE_WEBRTC) 2672 #endif // defined(ENABLE_WEBRTC)
2655 2673
2656 } // namespace chrome 2674 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698