From 4212ccdaedaef19695b97411f1c9e18236f0906e Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Thu, 14 Oct 2010 22:29:36 +0000 Subject: about:flags, part 2/3 Rename labs.html to flags.html, use the new images. BUG=59139 TEST=Go to about:flags. Notice new icons. Review URL: http://codereview.chromium.org/3801005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62663 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/theme/labs.png | Bin 1503 -> 0 bytes chrome/app/theme/labs_section.png | Bin 5319 -> 0 bytes chrome/app/theme/theme_resources.grd | 2 +- chrome/browser/browser_resources.grd | 2 +- chrome/browser/dom_ui/labs_ui.cc | 24 +-- chrome/browser/resources/flags.html | 321 +++++++++++++++++++++++++++++++++++ chrome/browser/resources/labs.html | 321 ----------------------------------- 7 files changed, 335 insertions(+), 335 deletions(-) delete mode 100644 chrome/app/theme/labs.png delete mode 100644 chrome/app/theme/labs_section.png create mode 100644 chrome/browser/resources/flags.html delete mode 100644 chrome/browser/resources/labs.html diff --git a/chrome/app/theme/labs.png b/chrome/app/theme/labs.png deleted file mode 100644 index fcfd00d..0000000 Binary files a/chrome/app/theme/labs.png and /dev/null differ diff --git a/chrome/app/theme/labs_section.png b/chrome/app/theme/labs_section.png deleted file mode 100644 index 0f133a0..0000000 Binary files a/chrome/app/theme/labs_section.png and /dev/null 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 @@ - + 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 --> - + 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/flags.html b/chrome/browser/resources/flags.html new file mode 100644 index 0000000..92d43a7 --- /dev/null +++ b/chrome/browser/resources/flags.html @@ -0,0 +1,321 @@ + + + + + + + + + + + diff --git a/chrome/browser/resources/labs.html b/chrome/browser/resources/labs.html deleted file mode 100644 index 3f008ed..0000000 --- a/chrome/browser/resources/labs.html +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - -- cgit v1.1