chrome/browser/resources/options/browser_options.html - Issue 152143009: Clarify settings UI in multi-profiles mode

Side by Side 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: string fixes, rebase 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
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="not pp_ifdef('chromeos')">	7 <if expr="pp_ifdef('chromeos')">

8 <include src="sync_section.html">	8 <include src="secondary_user_banner.html">

9 </if>	9 </if>

10 <if expr="pp_ifdef('chromeos')">	10 <if expr="pp_ifdef('chromeos')">

	11 <include src="secondary_user_banner.html">

11 <section>	12 <section>

12 <h3 i18n-content="sectionTitleInternet"></h3>	13 <div id="network-section-header" class="section-header">

	14 <h3 i18n-content="sectionTitleInternet"></h3>

	15 <span class="controlled-setting-indicator" plural></span>

	16 </div>

13 <div id="network-settings">	17 <div id="network-settings">

14 <list id="network-list"></list>	18 <list id="network-list"></list>

15 <div id="shared-proxies" class="checkbox">	19 <div id="shared-proxies" class="checkbox">

16 <label>	20 <label>

17 <input id="use-shared-proxies" type="checkbox"	21 <input id="use-shared-proxies" type="checkbox"

18 pref="settings.use_shared_proxies">	22 pref="settings.use_shared_proxies">

19 <span i18n-content="useSharedProxies"></span>	23 <span i18n-content="useSharedProxies"></span>

20 </label>	24 </label>

21 </div>	25 </div>

22 <div id="network-menus"></div>	26 <div id="network-menus"></div>

23 </div>	27 </div>

24 </section>	28 </section>

25 </if>	29 </if>

26 <if expr="not pp_ifdef('chromeos')">	30 <if expr="not pp_ifdef('chromeos')">

	31 <include src="sync_section.html">

27 <include src="startup_section.html">	32 <include src="startup_section.html">

28 </if>	33 </if>

29 <section>	34 <section>

30 <h3 i18n-content="sectionTitleAppearance"></h3>	35 <h3 i18n-content="sectionTitleAppearance"></h3>

31 <div class="settings-row">	36 <div class="settings-row">

32 <if expr="pp_ifdef('chromeos')">	37 <if expr="pp_ifdef('chromeos')">

33 <button id="set-wallpaper" i18n-content="setWallpaper"	38 <button id="set-wallpaper" i18n-content="setWallpaper"

34 guest-visibility="disabled"></button>	39 guest-visibility="disabled"></button>

35 </if>	40 </if>

36 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx">	41 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx">

(...skipping 847 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
884 </div>	889 </div>

885 </section>	890 </section>

886 </div> <!-- advanced-settings-container -->	891 </div> <!-- advanced-settings-container -->

887 </div> <!-- advanced-settings -->	892 </div> <!-- advanced-settings -->

888 <footer>	893 <footer>

889 <button id="advanced-settings-expander" class="link-button"	894 <button id="advanced-settings-expander" class="link-button"

890 i18n-content="showAdvancedSettings">	895 i18n-content="showAdvancedSettings">

891 </button>	896 </button>

892 </footer>	897 </footer>

893 </div>	898 </div>

OLD	NEW

« chrome/app/chromeos_strings.grdp ('K') | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »