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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts Created 8 years, 5 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/resources/options2/cookies_view_app.js ('k') | chrome/browser/resources/options2/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 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="optionsPageTitle"></title> 5 <title i18n-content="optionsPageTitle"></title>
6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON"> 6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
7 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 7 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
8 <link rel="stylesheet" href="chrome://resources/css/list.css"> 8 <link rel="stylesheet" href="chrome://resources/css/list.css">
9 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 9 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
10 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 10 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <if expr="pp_ifdef('use_nss')"> 107 <if expr="pp_ifdef('use_nss')">
108 <include src="certificate_manager.html"> 108 <include src="certificate_manager.html">
109 </if> 109 </if>
110 </div> 110 </div>
111 <div id="overlay-container-2" class="overlay transparent" hidden> 111 <div id="overlay-container-2" class="overlay transparent" hidden>
112 <include src="alert_overlay.html"> 112 <include src="alert_overlay.html">
113 <include src="autofill_edit_address_overlay.html"> 113 <include src="autofill_edit_address_overlay.html">
114 <include src="autofill_edit_creditcard_overlay.html"> 114 <include src="autofill_edit_creditcard_overlay.html">
115 <include src="content_settings_exceptions_area.html"> 115 <include src="content_settings_exceptions_area.html">
116 <include src="cookies_view.html"> 116 <include src="cookies_view.html">
117 <include src="cookies_view_app.html">
117 <include src="handler_options.html"> 118 <include src="handler_options.html">
118 <include src="language_add_language_overlay.html"> 119 <include src="language_add_language_overlay.html">
119 <include src="media_gallery_manager_overlay.html"> 120 <include src="media_gallery_manager_overlay.html">
120 <if expr="pp_ifdef('chromeos')"> 121 <if expr="pp_ifdef('chromeos')">
121 <include src="chromeos/internet_detail.html"> 122 <include src="chromeos/internet_detail.html">
122 <include src="chromeos/preferred_networks.html"> 123 <include src="chromeos/preferred_networks.html">
123 <include src="chromeos/language_chewing_options.html"> 124 <include src="chromeos/language_chewing_options.html">
124 <include src="chromeos/language_hangul_options.html"> 125 <include src="chromeos/language_hangul_options.html">
125 <include src="chromeos/language_mozc_options.html"> 126 <include src="chromeos/language_mozc_options.html">
126 <include src="chromeos/language_pinyin_options.html"> 127 <include src="chromeos/language_pinyin_options.html">
(...skipping 27 matching lines...) Expand all
154 <div class="page-banner-gradient"> 155 <div class="page-banner-gradient">
155 <span id="managed-prefs-text" class="page-banner-text"></span> 156 <span id="managed-prefs-text" class="page-banner-text"></span>
156 </div> 157 </div>
157 </div> 158 </div>
158 </div> 159 </div>
159 160
160 <script src="chrome://settings-frame/strings.js"></script> 161 <script src="chrome://settings-frame/strings.js"></script>
161 <script src="chrome://resources/js/i18n_template2.js"></script> 162 <script src="chrome://resources/js/i18n_template2.js"></script>
162 </body> 163 </body>
163 </html> 164 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/cookies_view_app.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698