Minor refactoring

shell/platform/common/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//flutter/common/config.gni")
-import("//flutter/shell/platform/config.gni")
 import("//flutter/shell/platform/tizen/config.gni")
 import("//flutter/testing/testing.gni")
 

shell/platform/tizen/channels/localization_channel_stub.cc

@@ -6,9 +6,7 @@
 
 namespace flutter {
 
-LocalizationChannel::LocalizationChannel(FlutterTizenEngine* engine) {
-  engine_ = nullptr;
-}
+LocalizationChannel::LocalizationChannel(FlutterTizenEngine* engine) {}
 
 LocalizationChannel::~LocalizationChannel() {}
 

shell/platform/tizen/channels/platform_channel.cc

@@ -162,6 +162,54 @@ class FeedbackManager {
 
 }  // namespace
 
+// Clipboard constants and variables
+namespace clipboard {
+
+// naive implementation using std::string as a container of internal clipboard
+// data
+std::string string_clipboard = "";
+
+static constexpr char kTextKey[] = "text";
+static constexpr char kTextPlainFormat[] = "text/plain";
+static constexpr char kUnknownClipboardFormatError[] =
+    "Unknown clipboard format error";
+static constexpr char kUnknownClipboardError[] =
+    "Unknown error during clipboard data retrieval";
+
+void GetData(const MethodCall<rapidjson::Document>& call,
+             std::unique_ptr<MethodResult<rapidjson::Document>> result) {
+  const rapidjson::Value& format = call.arguments()[0];
+
+  // https://api.flutter.dev/flutter/services/Clipboard/kTextPlain-constant.html
+  // API supports only kTextPlain format
+  if (strcmp(format.GetString(), kTextPlainFormat) != 0) {
+    result->Error(kUnknownClipboardFormatError,
+                  "Clipboard API only supports text.");
+    return;
+  }
+
+  rapidjson::Document document;
+  document.SetObject();
+  rapidjson::Document::AllocatorType& allocator = document.GetAllocator();
+  document.AddMember(rapidjson::Value(kTextKey, allocator),
+                     rapidjson::Value(string_clipboard, allocator), allocator);
+  result->Success(document);
+}
+
+void SetData(const MethodCall<rapidjson::Document>& call,
+             std::unique_ptr<MethodResult<rapidjson::Document>> result) {
+  const rapidjson::Value& document = *call.arguments();
+  rapidjson::Value::ConstMemberIterator itr = document.FindMember(kTextKey);
+  if (itr == document.MemberEnd()) {
+    result->Error(kUnknownClipboardError, "Invalid message format");
+    return;
+  }
+  string_clipboard = itr->value.GetString();
+  result->Success();
+}
+
+}  // namespace clipboard
+
 PlatformChannel::PlatformChannel(BinaryMessenger* messenger,
                                  TizenRenderer* renderer)
     : channel_(std::make_unique<MethodChannel<rapidjson::Document>>(
@@ -287,52 +335,4 @@ void PlatformChannel::HandleMethodCall(
   }
 }
 
-// Clipboard constants and variables
-namespace clipboard {
-
-// naive implementation using std::string as a container of internal clipboard
-// data
-std::string string_clipboard = "";
-
-static constexpr char kTextKey[] = "text";
-static constexpr char kTextPlainFormat[] = "text/plain";
-static constexpr char kUnknownClipboardFormatError[] =
-    "Unknown clipboard format error";
-static constexpr char kUnknownClipboardError[] =
-    "Unknown error during clipboard data retrieval";
-
-void GetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result) {
-  const rapidjson::Value& format = call.arguments()[0];
-
-  // https://api.flutter.dev/flutter/services/Clipboard/kTextPlain-constant.html
-  // API supports only kTextPlain format
-  if (strcmp(format.GetString(), kTextPlainFormat) != 0) {
-    result->Error(kUnknownClipboardFormatError,
-                  "Clipboard API only supports text.");
-    return;
-  }
-
-  rapidjson::Document document;
-  document.SetObject();
-  rapidjson::Document::AllocatorType& allocator = document.GetAllocator();
-  document.AddMember(rapidjson::Value(kTextKey, allocator),
-                     rapidjson::Value(string_clipboard, allocator), allocator);
-  result->Success(document);
-}
-
-void SetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result) {
-  const rapidjson::Value& document = *call.arguments();
-  rapidjson::Value::ConstMemberIterator itr = document.FindMember(kTextKey);
-  if (itr == document.MemberEnd()) {
-    result->Error(kUnknownClipboardError, "Invalid message format");
-    return;
-  }
-  string_clipboard = itr->value.GetString();
-  result->Success();
-}
-
-}  // namespace clipboard
-
 }  // namespace flutter

shell/platform/tizen/channels/platform_channel.h

@@ -20,6 +20,7 @@ class PlatformChannel {
   virtual ~PlatformChannel();
 
  private:
+#ifndef __X64_SHELL__
   void HandleMethodCall(
       const MethodCall<rapidjson::Document>& call,
       std::unique_ptr<MethodResult<rapidjson::Document>> result);
@@ -29,18 +30,9 @@ class PlatformChannel {
   // A reference to the renderer object managed by FlutterTizenEngine.
   // This can be nullptr if the engine is running in headless mode.
   TizenRenderer* renderer_;
+#endif
 };
 
-namespace clipboard {
-
-void GetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result);
-
-void SetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result);
-
-}  // namespace clipboard
-
 }  // namespace flutter
 
 #endif  // EMBEDDER_PLATFORM_CHANNEL_H_

shell/platform/tizen/channels/platform_channel_stub.cc

@@ -7,24 +7,8 @@
 namespace flutter {
 
 PlatformChannel::PlatformChannel(BinaryMessenger* messenger,
-                                 TizenRenderer* renderer) {
-  renderer_ = nullptr;
-}
+                                 TizenRenderer* renderer) {}
 
 PlatformChannel::~PlatformChannel() {}
 
-void PlatformChannel::HandleMethodCall(
-    const MethodCall<rapidjson::Document>& call,
-    std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
-
-namespace clipboard {
-
-void GetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
-
-void SetData(const MethodCall<rapidjson::Document>& call,
-             std::unique_ptr<MethodResult<rapidjson::Document>> result) {}
-
-}  // namespace clipboard
-
 }  // namespace flutter

shell/platform/tizen/channels/settings_channel.h

@@ -7,10 +7,6 @@
 
 #ifndef __X64_SHELL__
 #include <system/system_settings.h>
-#else
-typedef enum {
-  SYSTEM_SETTINGS_KEY_MAX,
-} system_settings_key_e;
 #endif
 
 #include <memory>
@@ -27,11 +23,13 @@ class SettingsChannel {
   virtual ~SettingsChannel();
 
  private:
+#ifndef __X64_SHELL__
   static void OnSettingsChangedCallback(system_settings_key_e key,
                                         void* user_data);
   void SendSettingsEvent();
 
   std::unique_ptr<BasicMessageChannel<rapidjson::Document>> channel_;
+#endif
 };
 
 }  // namespace flutter

shell/platform/tizen/channels/settings_channel_stub.cc

@@ -10,9 +10,4 @@ SettingsChannel::SettingsChannel(BinaryMessenger* messenger) {}
 
 SettingsChannel::~SettingsChannel() {}
 
-void SettingsChannel::SendSettingsEvent() {}
-
-void SettingsChannel::OnSettingsChangedCallback(system_settings_key_e key,
-                                                void* user_data) {}
-
 }  // namespace flutter

shell/platform/tizen/key_event_handler.cc

@@ -6,15 +6,6 @@
 
 #ifndef __X64_SHELL__
 #include <app.h>
-#else
-
-namespace {
-
-void ui_app_exit(void) {
-  exit(0);
-}
-
-};  // namespace
 #endif
 
 #include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
@@ -73,7 +64,9 @@ Eina_Bool KeyEventHandler::OnKey(void* data, int type, void* event) {
               engine->navigation_channel->PopRoute();
             }
           } else if (keyname == kExitKey && !is_down) {
+#ifndef __X64_SHELL__
             ui_app_exit();
+#endif
           }
         });
   }

shell/platform/tizen/key_event_handler.h

@@ -5,12 +5,11 @@
 #ifndef EMBEDDER_KEY_EVENT_HANDLER_H_
 #define EMBEDDER_KEY_EVENT_HANDLER_H_
 
+#include <Ecore_Input.h>
 #ifdef __X64_SHELL__
 #include <Efl_Core.h>
 #endif
 
-#include <Ecore_Input.h>
-
 #include <vector>
 
 namespace flutter {

shell/platform/tizen/touch_event_handler.h

@@ -5,12 +5,11 @@
 #ifndef EMBEDDER_TOUCH_EVENT_HANDLER_H_
 #define EMBEDDER_TOUCH_EVENT_HANDLER_H_
 
+#include <Ecore_Input.h>
 #ifdef __X64_SHELL__
 #include <Efl_Core.h>
 #endif
 
-#include <Ecore_Input.h>
-
 #include <vector>
 
 #include "flutter/shell/platform/embedder/embedder.h"