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

Unified Diff: components/version_ui/version_handler_helper.cc

Issue 1486403002: Mojo-ifying chrome://version. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change slashes Created 4 years, 5 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 | « components/version_ui/version_handler_helper.h ('k') | components/version_ui/version_ui_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/version_ui/version_handler_helper.cc
diff --git a/components/version_ui/version_handler_helper.cc b/components/version_ui/version_handler_helper.cc
index b24c03c6f76cf85979fb89867df7e4e0b49e97fe..10f525bc6c017f4942ec6f4f14ff3f1c3e373be5 100644
--- a/components/version_ui/version_handler_helper.cc
+++ b/components/version_ui/version_handler_helper.cc
@@ -14,7 +14,7 @@
namespace version_ui {
-std::unique_ptr<base::Value> GetVariationsList() {
+std::vector<std::string> GetVariations() {
std::vector<std::string> variations;
#if !defined(NDEBUG)
base::FieldTrial::ActiveGroups active_groups;
@@ -32,7 +32,12 @@ std::unique_ptr<base::Value> GetVariationsList() {
// In release mode, display the hashes only.
variations::GetFieldTrialActiveGroupIdsAsStrings(&variations);
#endif
+ return variations;
+}
+#if defined(OS_IOS)
+std::unique_ptr<base::Value> GetVariationsList() {
+ std::vector<std::string> variations = GetVariations();
std::unique_ptr<base::ListValue> variations_list(new base::ListValue);
for (std::vector<std::string>::const_iterator it = variations.begin();
it != variations.end(); ++it) {
@@ -41,5 +46,6 @@ std::unique_ptr<base::Value> GetVariationsList() {
return std::move(variations_list);
}
+#endif
} // namespace version_ui
« no previous file with comments | « components/version_ui/version_handler_helper.h ('k') | components/version_ui/version_ui_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698