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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options/browser_options.html

Issue 152143009: Clarify settings UI in multi-profiles mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/controlled_setting.js » ('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 ecdbf279ab59233d3849322cf9a7e614dfbea535..7098ccd71070ab7dd2523a976738956796ea40e7 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -4,12 +4,16 @@
</header>
<include src="reset_profile_settings_banner.html">
<include src="automatic_settings_reset_banner.html">
-<if expr="not pp_ifdef('chromeos')">
- <include src="sync_section.html">
+<if expr="pp_ifdef('chromeos')">
+ <include src="secondary_user_banner.html">
</if>
<if expr="pp_ifdef('chromeos')">
+ <include src="secondary_user_banner.html">
Dan Beam 2014/02/12 21:56:31 ^ why are you including this file twice?
michaelpg 2014/02/13 02:15:23 Duplicated code is duplicated. sorry!
<section>
- <h3 i18n-content="sectionTitleInternet"></h3>
+ <div id="network-section-header" class="section-header">
+ <h3 i18n-content="sectionTitleInternet"></h3>
+ <span class="controlled-setting-indicator" plural></span>
+ </div>
<div id="network-settings">
<list id="network-list"></list>
<div id="shared-proxies" class="checkbox">
@@ -24,6 +28,7 @@
</section>
</if>
<if expr="not pp_ifdef('chromeos')">
+ <include src="sync_section.html">
<include src="startup_section.html">
</if>
<section>
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/controlled_setting.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698