Organize includes and clean up

Author: swift-kim

shell/platform/tizen/channels/app_control.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "app_control.h"
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h"
+
 #include "flutter/shell/platform/tizen/channels/app_control_channel.h"
 
 namespace flutter {
@@ -109,8 +109,8 @@ AppControlResult AppControl::SetExtraData(const EncodableMap& map) {
   return AppControlResult();
 }
 
-void AppControl::SetManager(AppControlChannel* m) {
-  manager_ = m;
+void AppControl::SetManager(AppControlChannel* manager) {
+  manager_ = manager;
 }
 
 AppControlChannel* AppControl::GetManager() {

shell/platform/tizen/channels/app_control.h

@@ -6,14 +6,9 @@
 #define EMBEDDER_APP_CONTROL_H_
 
 #include <app.h>
-#include <queue>
-#include <unordered_map>
 
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h"
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 #include "flutter/shell/platform/tizen/logger.h"
 
 namespace flutter {

shell/platform/tizen/channels/app_control_channel.cc

@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <app.h>
-
-#include "app_control.h"
 #include "app_control_channel.h"
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h"
+#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
 
 namespace flutter {
 
-static constexpr char kChannelName[] = "tizen/internal/app_control_method";
-static constexpr char kEventChannelName[] = "tizen/internal/app_control_event";
-static constexpr char kReplyChannelName[] = "tizen/internal/app_control_reply";
+namespace {
+
+constexpr char kChannelName[] = "tizen/internal/app_control_method";
+constexpr char kEventChannelName[] = "tizen/internal/app_control_event";
+constexpr char kReplyChannelName[] = "tizen/internal/app_control_reply";
+
+}  // namespace
 
 AppControlChannel::AppControlChannel(BinaryMessenger* messenger) {
   method_channel_ = std::make_unique<MethodChannel<EncodableValue>>(

shell/platform/tizen/channels/app_control_channel.h

@@ -5,18 +5,17 @@
 #ifndef EMBEDDER_APP_CONTROL_CHANNEL_H_
 #define EMBEDDER_APP_CONTROL_CHANNEL_H_
 
+#include <memory>
 #include <queue>
 #include <unordered_map>
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
-#include "flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h"
+#include "flutter/shell/platform/tizen/channels/app_control.h"
 #include "flutter/shell/platform/tizen/logger.h"
 
-#include "app_control.h"
-
 namespace flutter {
 
 class AppControlChannel {
@@ -33,13 +32,11 @@ class AppControlChannel {
  private:
   void HandleMethodCall(const MethodCall<EncodableValue>& method_call,
                         std::unique_ptr<MethodResult<EncodableValue>> result);
-  void RegisterEventHandler(
-      std::unique_ptr<flutter::EventSink<EncodableValue>> events);
+  void RegisterEventHandler(std::unique_ptr<EventSink<EncodableValue>> events);
   void UnregisterEventHandler();
   void SendAlreadyQueuedEvents();
 
-  void RegisterReplyHandler(
-      std::unique_ptr<flutter::EventSink<EncodableValue>> events);
+  void RegisterReplyHandler(std::unique_ptr<EventSink<EncodableValue>> events);
   void UnregisterReplyHandler();
 
   template <typename T>

shell/platform/tizen/flutter_tizen_engine.h

@@ -94,9 +94,11 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
 
   TizenRenderer* renderer() { return renderer_.get(); }
 
+#ifndef __X64_SHELL__
   AppControlChannel* app_control_channel() {
     return app_control_channel_.get();
   }
+#endif
 
   KeyEventChannel* key_event_channel() { return key_event_channel_.get(); }