summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/theme/labs.pngbin1503 -> 0 bytes
-rw-r--r--chrome/app/theme/labs_section.pngbin5319 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/dom_ui/labs_ui.cc24
-rw-r--r--chrome/browser/resources/flags.html (renamed from chrome/browser/resources/labs.html)54
6 files changed, 41 insertions, 41 deletions
diff --git a/chrome/app/theme/labs.png b/chrome/app/theme/labs.png
deleted file mode 100644
index fcfd00d..0000000
--- a/chrome/app/theme/labs.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/labs_section.png b/chrome/app/theme/labs_section.png
deleted file mode 100644
index 0f133a0..0000000
--- a/chrome/app/theme/labs_section.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index a333eac..e7d6007 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -188,7 +188,7 @@
<include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
<include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
<include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" type="BINDATA" />
- <include name="IDR_LABS" file="labs.png" type="BINDATA" />
+ <include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
<include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="omnibox_popup_c.png" type="BINDATA" />
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 926e7cc..75bd699 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -38,7 +38,7 @@ without changes to the corresponding grd file. eter -->
<include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.json" type="BINDATA" />
- <include name="IDR_LABS_HTML" file="resources\labs.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/dom_ui/labs_ui.cc b/chrome/browser/dom_ui/labs_ui.cc
index 5164f53..7c06647 100644
--- a/chrome/browser/dom_ui/labs_ui.cc
+++ b/chrome/browser/dom_ui/labs_ui.cc
@@ -58,21 +58,21 @@ void LabsUIHTMLSource::StartDataRequest(const std::string& path,
int request_id) {
// Strings used in the JsTemplate file.
DictionaryValue localized_strings;
- localized_strings.SetString("labsLongTitle",
+ localized_strings.SetString("flagsLongTitle",
l10n_util::GetStringUTF16(IDS_FLAGS_LONG_TITLE));
- localized_strings.SetString("labsTableTitle",
+ localized_strings.SetString("flagsTableTitle",
l10n_util::GetStringUTF16(IDS_FLAGS_TABLE_TITLE));
- localized_strings.SetString("labsNoExperimentsAvailable",
+ localized_strings.SetString("flagsNoExperimentsAvailable",
l10n_util::GetStringUTF16(IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE));
localized_strings.SetString("flagsWarningHeader", l10n_util::GetStringUTF16(
IDS_FLAGS_WARNING_HEADER));
- localized_strings.SetString("labsBlurb", l10n_util::GetStringFUTF16(
+ localized_strings.SetString("flagsBlurb", l10n_util::GetStringFUTF16(
IDS_FLAGS_WARNING_TEXT,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
- localized_strings.SetString("labsRestartNotice", l10n_util::GetStringFUTF16(
+ localized_strings.SetString("flagsRestartNotice", l10n_util::GetStringFUTF16(
IDS_FLAGS_RESTART_NOTICE,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
- localized_strings.SetString("labsRestartButton",
+ localized_strings.SetString("flagsRestartButton",
l10n_util::GetStringUTF16(IDS_FLAGS_RESTART_BUTTON));
localized_strings.SetString("disable",
l10n_util::GetStringUTF16(IDS_FLAGS_DISABLE));
@@ -82,7 +82,7 @@ void LabsUIHTMLSource::StartDataRequest(const std::string& path,
ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
static const base::StringPiece labs_html(
- ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_LABS_HTML));
+ ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_FLAGS_HTML));
std::string full_html(labs_html.data(), labs_html.size());
jstemplate_builder::AppendJsonHtml(&localized_strings, &full_html);
jstemplate_builder::AppendI18nTemplateSourceHtml(&full_html);
@@ -125,9 +125,9 @@ class LabsDOMHandler : public DOMMessageHandler {
};
void LabsDOMHandler::RegisterMessages() {
- dom_ui_->RegisterMessageCallback("requestLabsExperiments",
+ dom_ui_->RegisterMessageCallback("requestFlagsExperiments",
NewCallback(this, &LabsDOMHandler::HandleRequestLabsExperiments));
- dom_ui_->RegisterMessageCallback("enableLabsExperiment",
+ dom_ui_->RegisterMessageCallback("enableFlagsExperiment",
NewCallback(this, &LabsDOMHandler::HandleEnableLabsExperimentMessage));
dom_ui_->RegisterMessageCallback("restartBrowser",
NewCallback(this, &LabsDOMHandler::HandleRestartBrowser));
@@ -135,12 +135,12 @@ void LabsDOMHandler::RegisterMessages() {
void LabsDOMHandler::HandleRequestLabsExperiments(const ListValue* args) {
DictionaryValue results;
- results.Set("labsExperiments",
+ results.Set("flagsExperiments",
about_labs::GetLabsExperimentsData(
dom_ui_->GetProfile()->GetPrefs()));
results.SetBoolean("needsRestart",
about_labs::IsRestartNeededToCommitChanges());
- dom_ui_->CallJavascriptFunction(L"returnLabsExperiments", results);
+ dom_ui_->CallJavascriptFunction(L"returnFlagsExperiments", results);
}
void LabsDOMHandler::HandleEnableLabsExperimentMessage(const ListValue* args) {
@@ -191,7 +191,7 @@ LabsUI::LabsUI(TabContents* contents) : DOMUI(contents) {
// static
RefCountedMemory* LabsUI::GetFaviconResourceBytes() {
return ResourceBundle::GetSharedInstance().
- LoadDataResourceBytes(IDR_LABS);
+ LoadDataResourceBytes(IDR_FLAGS);
}
// static
diff --git a/chrome/browser/resources/labs.html b/chrome/browser/resources/flags.html
index 3f008ed..92d43a7 100644
--- a/chrome/browser/resources/labs.html
+++ b/chrome/browser/resources/flags.html
@@ -30,7 +30,7 @@ html[dir=rtl] #header {
}
#header h1 {
- background: url('../../app/theme/labs_section.png') 0px 20px no-repeat;
+ background: url('../../app/theme/flags_section.png') 0px 20px no-repeat;
display: inline;
margin: 0;
padding-bottom: 43px;
@@ -39,7 +39,7 @@ html[dir=rtl] #header {
}
html[dir=rtl] #header h1 {
- background: url('../../app/theme/labs_section.png') right no-repeat;
+ background: url('../../app/theme/flags_section.png') right no-repeat;
padding-right: 95px;
padding-left: 0;
}
@@ -170,8 +170,8 @@ button {
* This variable structure is here to document the structure that the template
* expects to correctly populate the page.
*/
-var labsExperimentsDataFormat = {
- 'labsExperiments': [
+var flagsExperimentsDataFormat = {
+ 'flagsExperiments': [
{
'internal_name': 'Experiment ID string',
'name': 'Experiment Name',
@@ -183,25 +183,25 @@ var labsExperimentsDataFormat = {
};
/**
- * Takes the |labsExperimentsData| input argument which represents data about
+ * Takes the |flagsExperimentsData| input argument which represents data about
* the currently available experiments and populates the html jstemplate
* with that data. It expects an object structure like the above.
- * @param {Object} labsExperimentsData Detailed info about available experiments
+ * @param {Object} flagsExperimentsData Information about available experiments
*/
-function renderTemplate(labsExperimentsData) {
+function renderTemplate(flagsExperimentsData) {
// This is the javascript code that processes the template:
- var input = new JsEvalContext(labsExperimentsData);
- var output = document.getElementById('labsExperimentTemplate');
+ var input = new JsEvalContext(flagsExperimentsData);
+ var output = document.getElementById('flagsExperimentTemplate');
jstProcess(input, output);
}
/**
* Asks the C++ LabsDOMHandler to get details about the available experiments
* and return detailed data about the configuration. The LabsDOMHandler
- * should reply to returnLabsExperiments() (below).
+ * should reply to returnFlagsExperiments() (below).
*/
-function requestLabsExperimentsData() {
- chrome.send('requestLabsExperiments', []);
+function requestFlagsExperimentsData() {
+ chrome.send('requestFlagsExperiments', []);
}
/**
@@ -215,9 +215,9 @@ function restartBrowser() {
* Called by the dom_ui to re-populate the page with data representing the
* current state of installed experiments.
*/
-function returnLabsExperiments(labsExperimentsData){
+function returnFlagsExperiments(flagsExperimentsData){
var bodyContainer = document.getElementById('body-container');
- renderTemplate(labsExperimentsData);
+ renderTemplate(flagsExperimentsData);
bodyContainer.style.visibility = 'visible';
}
@@ -226,27 +226,27 @@ function returnLabsExperiments(labsExperimentsData){
*/
function handleEnableExperiment(node, enable) {
// Tell the C++ LabsDOMHandler to enable/disable the experiment.
- chrome.send('enableLabsExperiment', [String(node.internal_name),
+ chrome.send('enableFlagsExperiment', [String(node.internal_name),
String(enable)]);
- requestLabsExperimentsData();
+ requestFlagsExperimentsData();
}
// Get data and have it displayed upon loading.
-document.addEventListener('DOMContentLoaded', requestLabsExperimentsData);
+document.addEventListener('DOMContentLoaded', requestFlagsExperimentsData);
</script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id="body-container" style="visibility:hidden">
- <div id="header"><h1 i18n-content="labsLongTitle">TITLE</h1></div>
+ <div id="header"><h1 i18n-content="flagsLongTitle">TITLE</h1></div>
<div id="blurb-container">
<span id="blurb-warning" i18n-content="flagsWarningHeader">WARNING</span>
- <span i18n-content="labsBlurb">WARNING TEXT</span>
+ <span i18n-content="flagsBlurb">WARNING TEXT</span>
</div>
- <div id="labsExperimentTemplate">
+ <div id="flagsExperimentTemplate">
<div id="container" class="vbox-container">
<div id="top" class="wbox">
@@ -254,7 +254,7 @@ document.addEventListener('DOMContentLoaded', requestLabsExperimentsData);
<div class="section-header">
<table cellpadding="0" cellspacing="0"><tr valign="center">
<td>
- <span class="section-header-title" i18n-content="labsTableTitle"
+ <span class="section-header-title" i18n-content="flagsTableTitle"
>TITLE</span>
</td>
</tr></table>
@@ -265,13 +265,13 @@ document.addEventListener('DOMContentLoaded', requestLabsExperimentsData);
<div class="content">
<div class="experiment-name no-experiments"
- jsdisplay="labsExperiments.length === 0">
- <div i18n-content="labsNoExperimentsAvailable"
+ jsdisplay="flagsExperiments.length === 0">
+ <div i18n-content="flagsNoExperimentsAvailable"
>NO_EXPERIMENTS_ARE_AVAILABLE</div>
</div>
- <div jsdisplay="labsExperiments.length > 0">
- <div class="experiment" jsselect="labsExperiments">
+ <div jsdisplay="flagsExperiments.length > 0">
+ <div class="experiment" jsselect="flagsExperiments">
<table width="100%" cellpadding="2" cellspacing="0">
<tr class="experiment-enabled">
<td valign="top">
@@ -309,10 +309,10 @@ document.addEventListener('DOMContentLoaded', requestLabsExperimentsData);
</div>
<div class="needs-restart" jsdisplay="needsRestart">
- <div i18n-content="labsRestartNotice">NEEDS_RESTART</div>
+ <div i18n-content="flagsRestartNotice">NEEDS_RESTART</div>
<button type="button"
onclick="restartBrowser();"
- i18n-content="labsRestartButton">RESTART</button>
+ i18n-content="flagsRestartButton">RESTART</button>
</div>
</div>
</div>
generated by cgit v1.1 at 2025-03-06 04:43:46 +0000