Chromecast: adds Android implementation of CastSysInfo.

chromecast/base/cast_sys_info_android.h

Index: chromecast/base/cast_sys_info_android.h
diff --git a/chromecast/base/cast_sys_info_dummy.h b/chromecast/base/cast_sys_info_android.h
similarity index 57%
copy from chromecast/base/cast_sys_info_dummy.h
copy to chromecast/base/cast_sys_info_android.h
index 89a8b8beeb96659805d90b9871cfeedae46f2285..3139328046e718b39ddf3b41d7b0edb71cdf5cc8 100644
--- a/chromecast/base/cast_sys_info_dummy.h
+++ b/chromecast/base/cast_sys_info_android.h
@@ -1,30 +1,40 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_BASE_CAST_SYS_INFO_DUMMY_H_
-#define CHROMECAST_BASE_CAST_SYS_INFO_DUMMY_H_
+#ifndef CHROMECAST_BASE_CAST_SYS_INFO_ANDROID_H_
+#define CHROMECAST_BASE_CAST_SYS_INFO_ANDROID_H_
+
+#include <jni.h>
 
 #include "base/macros.h"
-#include "chromecast/public/cast_sys_info.h"
+#include "chromecast/base/cast_sys_info_dummy.h"

[lcwu1, 2015/05/19 02:01:44]

This header is no longer needed.

[gunsch, 2015/05/19 02:51:47]

Done.

+
+namespace base {
+namespace android {
+class BuildInfo;
+}
+}
 
 namespace chromecast {
 
-class CastSysInfoDummy : public CastSysInfo {
+class CastSysInfoAndroid : public CastSysInfo {
  public:
-  CastSysInfoDummy();
-  ~CastSysInfoDummy() override;
+  static bool RegisterJni(JNIEnv* env);
+
+  CastSysInfoAndroid();
+  ~CastSysInfoAndroid() override;
 
   // CastSysInfo implementation:
   BuildType GetBuildType() override;
-  std::string GetSystemReleaseChannel() override;
   std::string GetSerialNumber() override;
   std::string GetProductName() override;
   std::string GetDeviceModel() override;
-  std::string GetBoardName() override;
-  std::string GetBoardRevision() override;
   std::string GetManufacturer() override;
   std::string GetSystemBuildNumber() override;
+  std::string GetSystemReleaseChannel() override;
+  std::string GetBoardName() override;
+  std::string GetBoardRevision() override;
   std::string GetFactoryCountry() override;
   std::string GetFactoryLocale(std::string* second_locale) override;
   std::string GetWifiInterface() override;
@@ -33,10 +43,15 @@ class CastSysInfoDummy : public CastSysInfo {
   std::string GetGlRenderer() override;
   std::string GetGlVersion() override;
 
+  // Native implementation of Java methods.
+  void DeviceNameChanged(JNIEnv* env, jobject obj, jstring device_name);
+
  private:
-  DISALLOW_COPY_AND_ASSIGN(CastSysInfoDummy);
+  const base::android::BuildInfo* const build_info_;
+
+  DISALLOW_COPY_AND_ASSIGN(CastSysInfoAndroid);
 };
 
 }  // namespace chromecast
 
-#endif  // CHROMECAST_BASE_CAST_SYS_INFO_DUMMY_H_
+#endif  // CHROMECAST_BASE_CAST_SYS_INFO_ANDROID_H_