Skip to content

GitLab

T
tangled
Commit e107ad4e authored by jhawkins@chromium.org's avatar jhawkins@chromium.org
Browse files
Options

Options: Rename chrome/browser/resources/options2 -> chrome/browser/resources/options. 

BUG=none
TEST=none
R=csilv

Review URL: https://chromiumcodereview.appspot.com/10809005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152267 0039d316-1c4b-4281-b951-d872f2087c98
parent 7852c59a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 17 deletions
chrome/browser/resources/chromeos/proxy_settings.html
View file @ e107ad4e
......@@ -5,8 +5,8 @@
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="chrome://resources/css/widgets.css">
<link rel="stylesheet" href="../options2/options_page.css">
<link rel="stylesheet" href="../options2/chromeos/internet_detail.css">
<link rel="stylesheet" href="../options/options_page.css">
<link rel="stylesheet" href="../options/chromeos/internet_detail.css">
<link rel="stylesheet" href="proxy_settings.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/event_tracker.js"></script>
......@@ -22,16 +22,16 @@
<script src="chrome://resources/js/local_strings.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="../options2/preferences.js"></script>
<script src="../options2/pref_ui.js"></script>
<script src="../options2/options_page.js"></script>
<script src="../options2/chromeos/internet_detail.js"></script>
<script src="../options2/chromeos/proxy_rules_list.js"></script>
<script src="../options/preferences.js"></script>
<script src="../options/pref_ui.js"></script>
<script src="../options/options_page.js"></script>
<script src="../options/chromeos/internet_detail.js"></script>
<script src="../options/chromeos/proxy_rules_list.js"></script>
<script src="proxy_settings.js"></script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<include src="../options2/chromeos/internet_detail.html">
<include src="../options/chromeos/internet_detail.html">
</body>
</html>
chrome/browser/resources/options2/chromeos/accounts_options_page.css → chrome/browser/resources/options/chromeos/accounts_options_page.css
View file @ e107ad4e
......@@ -85,7 +85,7 @@
#ownerOnlyWarning {
-webkit-padding-start: 20px;
background-image: url('../../options/chromeos/warning.png');
background-image: url('warning.png');
background-repeat: no-repeat;
margin-bottom: 10px;
margin-top: 10px;
......
chrome/chrome_resources.gyp
View file @ e107ad4e
This diff is collapsed.
tools/gritsettings/resource_ids
View file @ e107ad4e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment