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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/browser_options.html

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/suspicious_extension_bubble_controller.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 </header> 4 </header>
5 <include src="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <include src="automatic_settings_reset_banner.html"> 6 <include src="automatic_settings_reset_banner.html">
7 <if expr="chromeos"> 7 <if expr="chromeos">
8 <include src="secondary_user_banner.html"> 8 <include src="secondary_user_banner.html">
9 <section> 9 <section>
10 <div id="network-section-header" class="section-header"> 10 <div id="network-section-header" class="section-header">
(...skipping 11 matching lines...) Expand all
22 </label> 22 </label>
23 </div> 23 </div>
24 <div id="network-menus"></div> 24 <div id="network-menus"></div>
25 </div> 25 </div>
26 </section> 26 </section>
27 </if> 27 </if>
28 <if expr="not chromeos"> 28 <if expr="not chromeos">
29 <include src="sync_section.html"> 29 <include src="sync_section.html">
30 <include src="startup_section.html"> 30 <include src="startup_section.html">
31 </if> 31 </if>
32 <section id="proxy-section" hidden>
33 <h3 i18n-content="sectionTitleProxy"></h3>
34 <div id="proxy-section-content"></div>
35 </section>
36
32 <section> 37 <section>
33 <h3 i18n-content="sectionTitleAppearance"></h3> 38 <h3 i18n-content="sectionTitleAppearance"></h3>
34 <div class="settings-row"> 39 <div class="settings-row">
35 <if expr="chromeos"> 40 <if expr="chromeos">
36 <button id="set-wallpaper" i18n-content="setWallpaper" 41 <button id="set-wallpaper" i18n-content="setWallpaper"
37 guest-visibility="disabled"></button> 42 guest-visibility="disabled"></button>
38 <span id="wallpaper-indicator" class="controlled-setting-indicator"> 43 <span id="wallpaper-indicator" class="controlled-setting-indicator">
39 </span> 44 </span>
40 </if> 45 </if>
41 <if expr="not chromeos and is_posix and not is_macosx"> 46 <if expr="not chromeos and is_posix and not is_macosx">
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 <span i18n-content="tabsToLinksPref"></span> 554 <span i18n-content="tabsToLinksPref"></span>
550 </label> 555 </label>
551 </div> 556 </div>
552 </if> 557 </if>
553 </div> 558 </div>
554 </section> 559 </section>
555 <if expr="not chromeos"> 560 <if expr="not chromeos">
556 <section id="network-section"> 561 <section id="network-section">
557 <h3 i18n-content="advancedSectionTitleNetwork"></h3> 562 <h3 i18n-content="advancedSectionTitleNetwork"></h3>
558 <div> 563 <div>
559 <span id="proxiesLabel" class="settings-row"></span> 564 <span id="proxiesLabel"
565 class="settings-row"
566 i18n-content="proxiesLabelSystem"></span>
560 <div class="settings-row"> 567 <div class="settings-row">
561 <button id="proxiesConfigureButton" 568 <button id="proxiesConfigureButton"
562 i18n-content="proxiesConfigureButton"></button> 569 i18n-content="proxiesConfigureButton"></button>
563 <span class="controlled-setting-indicator" pref="proxy" plural></span> 570 <span class="controlled-setting-indicator" pref="proxy" plural></span>
564 </div> 571 </div>
565 </div> 572 </div>
566 </section> 573 </section>
567 </if> 574 </if>
568 <section id="languages-section"> 575 <section id="languages-section">
569 <h3 i18n-content="advancedSectionTitleLanguages"></h3> 576 <h3 i18n-content="advancedSectionTitleLanguages"></h3>
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 </div> 933 </div>
927 </section> 934 </section>
928 </div> <!-- advanced-settings-container --> 935 </div> <!-- advanced-settings-container -->
929 </div> <!-- advanced-settings --> 936 </div> <!-- advanced-settings -->
930 <footer> 937 <footer>
931 <button id="advanced-settings-expander" class="link-button" 938 <button id="advanced-settings-expander" class="link-button"
932 i18n-content="showAdvancedSettings"> 939 i18n-content="showAdvancedSettings">
933 </button> 940 </button>
934 </footer> 941 </footer>
935 </div> 942 </div>
OLDNEW
« no previous file with comments | « chrome/browser/extensions/suspicious_extension_bubble_controller.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698