diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 16:36:16 +0000 |
| commit | 3627b06dd62f0e4748ab57208eac7988c92932a2 (patch) | |
| tree | ea09e487e10a072b1ce2b16c55bf90dfcd466e94 /chrome/app | |
| parent | 2500710027b1034c281b4ef99e0907d96759996b (diff) | |
| download | chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.zip chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.gz chromium_src-3627b06dd62f0e4748ab57208eac7988c92932a2.tar.bz2 | |
Move click-to-play to about:flags.
XIB changes: Add an outlet |pluginDefaultSettingMatrix_| to ContentSettingsDialogController, hooked up to the associated matrix, to remove the click-to-play radio button.
While I'm at it, clean up a bit:
* Remove the old --disable-click-to-play flag that reverted to the M6 behavior for blocked plugins
* Make ContentExceptionsWindowController use ContentSettingComboModel for the action popup.
* Make HostContentSettingsMapTest use AutoReset to reset command line switches.
BUG=62091
TEST=unit_tests
Review URL: http://codereview.chromium.org/4643007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/app/nibs/ContentSettings.xib | 48 |
2 files changed, 33 insertions, 21 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 13c1e5d..a409a09 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4110,6 +4110,12 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION" desc="Description of the 'Experimental Extension APIs' lab."> Enables experimental extension APIs. Note that the extension gallery doesn't allow you to upload extensions that use experimental APIs. </message> + <message name="IDS_FLAGS_CLICK_TO_PLAY_NAME" desc="Name of the 'Click-to-Play' lab."> + Click-to-Play + </message> + <message name="IDS_FLAGS_CLICK_TO_PLAY_DESCRIPTION" desc="Description of the 'Click-to-Play' lab."> + Click on a blocked plug-in to run it. + </message> <!-- Instant --> <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibox dropdown for enabling instant"> diff --git a/chrome/app/nibs/ContentSettings.xib b/chrome/app/nibs/ContentSettings.xib index f760703..630946f 100644 --- a/chrome/app/nibs/ContentSettings.xib +++ b/chrome/app/nibs/ContentSettings.xib @@ -2386,26 +2386,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: pluginsEnabledIndex</string> - <reference key="source" ref="564209934"/> - <reference key="destination" ref="1001"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="564209934"/> - <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">selectedIndex: pluginsEnabledIndex</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">pluginsEnabledIndex</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string> - <boolean value="NO" key="NS.object.0"/> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">86</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">selectedIndex: javaScriptEnabledIndex</string> <reference key="source" ref="35110844"/> <reference key="destination" ref="1001"/> @@ -2648,6 +2628,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">213</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">pluginDefaultSettingMatrix_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="564209934"/> + </object> + <int key="connectionID">216</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">selectedTag: pluginsEnabledIndex</string> + <reference key="source" ref="564209934"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="564209934"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">selectedTag: pluginsEnabledIndex</string> + <string key="NSBinding">selectedTag</string> + <string key="NSKeyPath">pluginsEnabledIndex</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">217</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3608,7 +3612,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">215</int> + <int key="maxID">217</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3657,11 +3661,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>pluginDefaultSettingMatrix_</string> <string>tabViewPicker_</string> <string>tabView_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMatrix</string> <string>TabViewPickerTable</string> <string>NSTabView</string> </object> |