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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: Address review comments Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/settings_api_helpers.cc ('K') | « chrome/browser/extensions/settings_api_helpers.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/ui/views/settings_api_bubble_helper_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/browser_options.html
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index f225218330ea7ecfb65a5b45004d9113d51f009d..9a1f61bd7efdcec5479d5f78abcf6bce9283c609 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -29,6 +29,11 @@
<include src="sync_section.html">
<include src="startup_section.html">
</if>
+ <section id="proxy-section" hidden>
+ <h3 i18n-content="sectionTitleProxy"></h3>
+ <div id="proxy-section-content"></div>
+ </section>
+
<section>
<h3 i18n-content="sectionTitleAppearance"></h3>
<div class="settings-row">
@@ -556,7 +561,9 @@
<section id="network-section">
<h3 i18n-content="advancedSectionTitleNetwork"></h3>
<div>
- <span id="proxiesLabel" class="settings-row"></span>
+ <span id="proxiesLabel"
+ class="settings-row"
+ i18n-content="proxiesLabelSystem"></span>
<div class="settings-row">
<button id="proxiesConfigureButton"
i18n-content="proxiesConfigureButton"></button>
« chrome/browser/extensions/settings_api_helpers.cc ('K') | « chrome/browser/extensions/settings_api_helpers.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/ui/views/settings_api_bubble_helper_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698