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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/proxy_settings.html

Issue 9702011: Migrate proxy-settings.html to options2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright notices. Created 8 years, 9 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/resources/chromeos/proxy_settings.css ('k') | chrome/browser/resources/chromeos/proxy_settings.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/proxy_settings.html
diff --git a/chrome/browser/resources/chromeos/proxy_settings.html b/chrome/browser/resources/chromeos/proxy_settings.html
index 5fa7e2b103ff6b194ffa0de29a5067ed6571bcac..97fa8eeaddabc76c287b704be0f3d5f21c997f59 100644
--- a/chrome/browser/resources/chromeos/proxy_settings.html
+++ b/chrome/browser/resources/chromeos/proxy_settings.html
@@ -4,11 +4,10 @@
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
-<link rel="stylesheet" href="../options/options_page.css">
-<link rel="stylesheet" href="../options/chromeos/internet_options_page.css">
-<link rel="stylesheet" href="../options/chromeos/proxy.css">
-<link rel="stylesheet" href="proxy_settings.css">
+<link rel="stylesheet" href="../options2/options_page.css">
+<link rel="stylesheet" href="../options2/chromeos/internet_detail.css">
+<link rel="stylesheet" href="proxy_settings.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script>
@@ -23,14 +22,14 @@
<script src="../options/preferences.js"></script>
<script src="../options/pref_ui.js"></script>
<script src="../options/options_page.js"></script>
-<script src="../options/chromeos/proxy_options.js"></script>
-<script src="../options/chromeos/proxy_rules_list.js"></script>
+<script src="../options2/chromeos/internet_detail.js"></script>
+<script src="../options2/chromeos/proxy_rules_list.js"></script>
<script src="proxy_settings.js"></script>
</head>
<!-- We do not override the fontSize because it is defined in
internet_options_page.css. -->
<body i18n-values=".style.fontFamily:fontfamily">
-<include src="../options/chromeos/proxy.html">
+<include src="../options2/chromeos/internet_detail.html">
</body>
</html>
« no previous file with comments | « chrome/browser/resources/chromeos/proxy_settings.css ('k') | chrome/browser/resources/chromeos/proxy_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698