diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 10:57:36 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 10:57:36 +0000 |
| commit | 9a4a34ac02f7317286b5edde3ce98ec9cb35deb5 (patch) | |
| tree | e6c5bc0a74c2708e703cc6edf086dc4d3bf5d467 /chrome/app | |
| parent | 5b7a0cfbc0c936545c214e681df783cb7bd81222 (diff) | |
| download | chromium_src-9a4a34ac02f7317286b5edde3ce98ec9cb35deb5.zip chromium_src-9a4a34ac02f7317286b5edde3ce98ec9cb35deb5.tar.gz chromium_src-9a4a34ac02f7317286b5edde3ce98ec9cb35deb5.tar.bz2 | |
Disable proxy config button and show banner if proxy prefs are managed.
Preferences.xib changes: Connect Enabled of the proxies configuration button to
a getter in PreferencesWindowController.
BUG=49538
TEST=Unit test in pref_set_observer_unittest.cc, manually configure proxy policies, check advanced options page.
Review URL: http://codereview.chromium.org/3038013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/nibs/Preferences.xib | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index 79e9daf..9ceed27 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -3824,6 +3824,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">714</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: proxiesConfigureButtonEnabled</string> + <reference key="source" ref="383918134"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="383918134"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: proxiesConfigureButtonEnabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">proxiesConfigureButtonEnabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">717</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> |