Introduce system_info as an independent container.

athena/util/athena_constants.h

Index: athena/util/athena_constants.h
diff --git a/athena/util/switches.h b/athena/util/athena_constants.h
similarity index 50%
copy from athena/util/switches.h
copy to athena/util/athena_constants.h
index d884e2cfe4c34e4a471d860672c6352f44efd11e..22960ba49c59fff8b8063fdc06357ad8c3539a0c 100644
--- a/athena/util/switches.h
+++ b/athena/util/athena_constants.h
@@ -2,19 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_UTIL_SWITCHES_H_
-#define ATHENA_UTIL_SWITCHES_H_
+#ifndef ATHENA_UTIL_ATHENA_CONSTANTS_H_
+#define ATHENA_UTIL_ATHENA_CONSTANTS_H_
 
 #include "athena/athena_export.h"
 
 namespace athena {
-namespace switches {
 
-ATHENA_EXPORT extern const char kEnableDebugAccelerators[];
+// The height of the system UI area.
+ATHENA_EXPORT extern const int kSystemUIHeight;
 
-bool IsDebugAcceleratorsEnabled();
-
-}  // namespace switches
 }  // namespace athena
 
-#endif  // ATHENA_UTIL_SWITCHES_H_
+#endif  // ATHENA_UTIL_ATHENA_CONSTANTS_H_