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

Unified Diff: remoting/base/chromoting_event.cc

Issue 2807803002: Move name_value_map to remoting/base (Closed)
Patch Set: sync Created 3 years, 8 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 | « remoting/base/BUILD.gn ('k') | remoting/base/name_value_map.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/chromoting_event.cc
diff --git a/remoting/base/chromoting_event.cc b/remoting/base/chromoting_event.cc
index 1ac93900b7b2002a0ed11f91b9bd4cf005f060f3..2991a4c3fc8cedb75bbf6ce3d9911b266272f53b 100644
--- a/remoting/base/chromoting_event.cc
+++ b/remoting/base/chromoting_event.cc
@@ -7,9 +7,23 @@
#include "base/strings/string_util.h"
#include "base/strings/stringize_macros.h"
#include "base/sys_info.h"
+#include "remoting/base/name_value_map.h"
namespace remoting {
+namespace {
+
+const NameMapElement<ChromotingEvent::Os> kOsNames[] = {
+ {ChromotingEvent::Os::CHROMOTING_LINUX, "linux"},
+ {ChromotingEvent::Os::CHROMOTING_CHROMEOS, "chromeos"},
+ {ChromotingEvent::Os::CHROMOTING_MAC, "mac"},
+ {ChromotingEvent::Os::CHROMOTING_WINDOWS, "windows"},
+ {ChromotingEvent::Os::CHROMOTING_ANDROID, "android"},
+ {ChromotingEvent::Os::CHROMOTING_IOS, "ios"},
+};
+
+} // namespace
+
const char ChromotingEvent::kCaptureLatencyKey[] = "capture_latency";
const char ChromotingEvent::kConnectionErrorKey[] = "connection_error";
const char ChromotingEvent::kCpuKey[] = "cpu";
@@ -126,23 +140,12 @@ bool ChromotingEvent::IsEndOfSession(SessionState state) {
// static
ChromotingEvent::Os ChromotingEvent::ParseOsFromString(const std::string& os) {
- std::string lower_os = base::ToLowerASCII(os);
- // TODO(yuweih): Refactor remoting/protocol/name_value_map.h and use it to
- // map the value.
- if (lower_os == "linux") {
- return Os::CHROMOTING_LINUX;
- } else if (lower_os == "chromeos") {
- return Os::CHROMOTING_CHROMEOS;
- } else if (lower_os == "mac") {
- return Os::CHROMOTING_MAC;
- } else if (lower_os == "windows") {
- return Os::CHROMOTING_WINDOWS;
- } else if (lower_os == "android") {
- return Os::CHROMOTING_ANDROID;
- } else if (lower_os == "ios") {
- return Os::CHROMOTING_IOS;
+ ChromotingEvent::Os result;
+ if (!NameToValue(kOsNames, base::ToLowerASCII(os), &result)) {
+ return Os::OTHER;
}
- return Os::OTHER;
+
+ return result;
}
} // namespace remoting
« no previous file with comments | « remoting/base/BUILD.gn ('k') | remoting/base/name_value_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698