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

Side by Side Diff: chrome/browser/resources/options/chromeos/internet_detail.html

Issue 13334007: Added "Use an autoconfiguration URL" checkbox in proxy tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src@git-svn
Patch Set: Fixed conflict in Authors file Created 7 years, 8 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 <div id="details-internet-page" class="page" hidden> 1 <div id="details-internet-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <!-- Network header --> 3 <!-- Network header -->
4 <div id="network-details-header"> 4 <div id="network-details-header">
5 <div id="network-details-title"></div> 5 <div id="network-details-title"></div>
6 <div id="network-details-subtitle"> 6 <div id="network-details-subtitle">
7 <span id="network-details-subtitle-status"></span> 7 <span id="network-details-subtitle-status"></span>
8 <span id="network-details-subtitle-separator"> - </span> 8 <span id="network-details-subtitle-separator"> - </span>
9 <span id="network-details-subtitle-type"></span> 9 <span id="network-details-subtitle-type"></span>
10 </div> 10 </div>
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 </tr> 643 </tr>
644 </table> 644 </table>
645 </div> 645 </div>
646 <div class="radio"> 646 <div class="radio">
647 <label> 647 <label>
648 <input id="auto-proxy" type="radio" name="proxytype" value="3" 648 <input id="auto-proxy" type="radio" name="proxytype" value="3"
649 pref="cros.session.proxy.type"> 649 pref="cros.session.proxy.type">
650 <span i18n-content="proxyAutomatic"></span> 650 <span i18n-content="proxyAutomatic"></span>
651 </label> 651 </label>
652 </div> 652 </div>
653 <div class="checkbox">
654 <label>
655 <input id="proxy-use-pac-url" type="checkbox"
656 pref="cros.session.proxy.usepacurl">
657 <span i18n-content="proxyUseConfigUrl"></span>
658 </label>
659 </div>
653 <div> 660 <div>
654 <label> 661 <label>
655 <div i18n-content="proxyConfigUrl"></div> 662 <input id="proxy-pac-url" type="url" size="50"
656 <input id="proxy-config" type="url" size="50"
657 pref="cros.session.proxy.pacurl"> 663 pref="cros.session.proxy.pacurl">
658 </label> 664 </label>
659 </div> 665 </div>
660 <div id="advanced-config"> 666 <div id="advanced-config">
661 <h3 i18n-content="advancedProxyConfig"></h3> 667 <h3 i18n-content="advancedProxyConfig"></h3>
662 <div class="option vbox flex"> 668 <div class="option vbox flex">
663 <div i18n-content="proxyBypass"></div> 669 <div i18n-content="proxyBypass"></div>
664 <list id="ignored-host-list"></list> 670 <list id="ignored-host-list"></list>
665 <input id="new-host" type="url" size="30"> 671 <input id="new-host" type="url" size="30">
666 <button id="add-host" i18n-content="addHost"></button> 672 <button id="add-host" i18n-content="addHost"></button>
(...skipping 13 matching lines...) Expand all
680 </button> 686 </button>
681 <button id="details-internet-disconnect" i18n-content="disconnectButton"> 687 <button id="details-internet-disconnect" i18n-content="disconnectButton">
682 </button> 688 </button>
683 <button id="activate-details" i18n-content="activateButton"></button> 689 <button id="activate-details" i18n-content="activateButton"></button>
684 <button id="buyplan-details" i18n-content="buyplanButton"></button> 690 <button id="buyplan-details" i18n-content="buyplanButton"></button>
685 <button id="view-account-details" i18n-content="viewAccountButton"> 691 <button id="view-account-details" i18n-content="viewAccountButton">
686 </button> 692 </button>
687 </div> 693 </div>
688 </div> 694 </div>
689 </div> 695 </div>
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/proxy_cros_settings_parser.cc ('k') | chrome/browser/resources/options/chromeos/internet_detail.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698