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
Show 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/browser/resources/options2_resources.grd → chrome/browser/resources/options_resources.grd
View file @ e107ad4e
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/options2_resources.h" type="rc_header">
<output filename="grit/options_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="options2_resources.pak" type="data_package" />
<output filename="options_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<structures>
<structure name="IDR_OPTIONS2_BUNDLE_JS" file="options2/options_bundle.js" flattenhtml="true" type="chrome_html" />
<structure name="IDR_OPTIONS2_HTML" file="options2/options.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
<structure name="IDR_OPTIONS_BUNDLE_JS" file="options/options_bundle.js" flattenhtml="true" type="chrome_html" />
<structure name="IDR_OPTIONS_HTML" file="options/options.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
</structures>
</release>
</grit>
chrome/browser/resources/sync_promo/sync_promo.js
View file @ e107ad4e
......@@ -3,7 +3,7 @@
// found in the LICENSE file.
// TODO(sail): Refactor options_page and remove this include.
<include src="../options2/options_page.js"/>
<include src="../options/options_page.js"/>
<include src="../shared/js/util.js"/>
<include src="../sync_setup_overlay.js"/>
......
chrome/browser/resources/web_dev_style/js_checker.py
View file @ e107ad4e
......@@ -79,7 +79,7 @@ class JSChecker(object):
path.join(resources, 'net_internals'),
path.join(resources, 'network_action_predictor'),
path.join(resources, 'ntp4'),
path.join(resources, 'options2'),
path.join(resources, 'options'),
path.join(resources, 'print_preview'),
path.join(resources, 'profiler'),
path.join(resources, 'sync_promo'),
......
chrome/browser/ui/webui/options2/options_ui.cc
View file @ e107ad4e
......@@ -54,7 +54,7 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/options2_resources.h"
#include "grit/options_resources.h"
#include "grit/theme_resources.h"
#include "net/base/escape.h"
#include "ui/base/layout.h"
......@@ -148,11 +148,11 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,
} else if (path == kOptionsBundleJsFile) {
// Return (and cache) the options javascript code.
response_bytes = ui::ResourceBundle::GetSharedInstance().
LoadDataResourceBytes(IDR_OPTIONS2_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
LoadDataResourceBytes(IDR_OPTIONS_BUNDLE_JS, ui::SCALE_FACTOR_NONE);
} else {
// Return (and cache) the main options html page as the default.
response_bytes = ui::ResourceBundle::GetSharedInstance().
LoadDataResourceBytes(IDR_OPTIONS2_HTML, ui::SCALE_FACTOR_NONE);
LoadDataResourceBytes(IDR_OPTIONS_HTML, ui::SCALE_FACTOR_NONE);
}
SendResponse(request_id, response_bytes);
......
chrome/chrome_resources.gyp
View file @ e107ad4e
......@@ -32,9 +32,9 @@
'includes': [ '../build/grit_action.gypi' ],
},
{
'action_name': 'options2_resources',
'action_name': 'options_resources',
'variables': {
'grit_grd_file': 'browser/resources/options2_resources.grd',
'grit_grd_file': 'browser/resources/options_resources.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
......
tools/gritsettings/resource_ids
View file @ e107ad4e
......@@ -159,7 +159,7 @@
"chrome/browser/resources/options_resources.grd": {
"includes": [23000],
},
"chrome/browser/resources/options2_resources.grd": {
"chrome/browser/resources/options_resources.grd": {
"structures": [23200],
},
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
......
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