Merge 119773 - Move click-to-play out of chrome://flags.

chrome/browser/resources/options/content_settings.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
 
   var OptionsPage = options.OptionsPage;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
 
@@ skipping 46 matching lines @@
           OptionsPage.navigateToPage('intents');
         };
       }
 
       // Cookies filter page ---------------------------------------------------
       $('show-cookies-button').onclick = function(event) {
         chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
         OptionsPage.navigateToPage('cookies');
       };
 
-      if (!templateData.enable_click_to_play)
-        $('click_to_play').hidden = true;
-
       if (!templateData.enable_web_intents && $('intent-section'))
         $('intent-section').hidden = true;
     },
   };
 
   ContentSettings.updateHandlersEnabledRadios = function(enabled) {
     var selector = '#content-settings-page input[type=radio][value=' +
         (enabled ? 'allow' : 'block') + '].handler-radio';
     document.querySelector(selector).checked = true;
   };
@@ skipping 64 matching lines @@
                                'list[mode=' + mode + ']');
     exceptionsList.patternValidityCheckComplete(pattern, valid);
   };
 
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });