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

Unified Diff: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/ui/webui/help/help_ui.cc ('k') | chrome/browser/ui/webui/options/help_overlay_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index f82464e9d3cbb9ffff2ccf13b439d47cf1213b3d..c6bbe70d5aa148280d488137525f885af928a5d8 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -23,7 +23,9 @@
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
+#include "chrome/browser/ui/webui/help/help_handler.h"
#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/user_metrics.h"
@@ -326,6 +328,13 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues(
IDS_OPTIONS_CONTROLLED_SETTING_OWNER,
base::ASCIIToUTF16(user_manager->GetOwnerEmail())));
}
+
+ localized_strings->SetString(
+ "browserVersion",
+ l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
+ ::HelpHandler::BuildBrowserVersionString()));
+ localized_strings->SetBoolean("showVersion",
+ ::switches::AboutInSettingsEnabled());
}
void CoreChromeOSOptionsHandler::SelectNetworkCallback(
« no previous file with comments | « chrome/browser/ui/webui/help/help_ui.cc ('k') | chrome/browser/ui/webui/options/help_overlay_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698