Address review comments (documentation, alignment, constructor

parameters)

Author: franciscojma86

library/linux/src/embedder.cc

@@ -51,6 +51,9 @@ struct FlutterEmbedderState {
   // deleted from the heap.
   std::vector<flutter_desktop_embedding::KeyboardHookHandler *>
       keyboard_hook_handlers;
+  // Handles raw key interactions from GLFW.
+  // TODO: Move key_event_handler once
+  // https://github.com/google/flutter-desktop-embedding/issues/102 is resolved.
   std::unique_ptr<flutter_desktop_embedding::KeyEventHandler> key_event_handler;
 };
 
@@ -275,8 +278,8 @@ GLFWwindow *CreateFlutterWindow(size_t initial_width, size_t initial_height,
   state->plugin_handler = std::make_unique<PluginHandler>(engine);
   state->engine = engine;
 
-  state->key_event_handler = std::make_unique<KeyEventHandler>();
-  state->key_event_handler->SetBinaryMessenger(state->plugin_handler.get());
+  state->key_event_handler =
+      std::make_unique<KeyEventHandler>(state->plugin_handler.get());
   state->keyboard_hook_handlers.push_back(state->key_event_handler.get());
   auto input_plugin = std::make_unique<TextInputPlugin>();
   state->keyboard_hook_handlers.push_back(input_plugin.get());

library/linux/src/internal/key_event_handler.cc

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "library/linux/src/internal/key_event_handler.h"
-#include "library/linux/src/internal/json_message_codec.h"
 
-#include <flutter_embedder.h>
 #include <json/json.h>
 #include <iostream>
 
+#include "library/linux/src/internal/json_message_codec.h"
+
 static constexpr char kChannelName[] = "flutter/keyevent";
 
 static constexpr char kKeyCodeKey[] = "keyCode";
@@ -31,17 +31,16 @@ static constexpr char kKeyDown[] = "keydown";
 static constexpr char kRepeat[] = "repeat";
 
 namespace flutter_desktop_embedding {
-KeyEventHandler::KeyEventHandler() : channel_(kChannelName) {}
-KeyEventHandler::~KeyEventHandler() {}
 
-void KeyEventHandler::SetBinaryMessenger(BinaryMessenger *messenger) {
-  messenger_ = messenger;
-}
+KeyEventHandler::KeyEventHandler(const BinaryMessenger *messenger)
+    : messenger_(messenger), channel_(kChannelName) {}
+
+KeyEventHandler::~KeyEventHandler() {}
 
 void KeyEventHandler::CharHook(GLFWwindow *window, unsigned int code_point) {}
 
 void KeyEventHandler::KeyboardHook(GLFWwindow *window, int key, int scancode,
-                                  int action, int mods) {
+                                   int action, int mods) {
   // TODO: Translate to a cross-platform key code system rather than passing
   // the native key code.
   Json::Value args;
@@ -56,7 +55,8 @@ void KeyEventHandler::KeyboardHook(GLFWwindow *window, int key, int scancode,
       args[kTypeKey] = kKeyUp;
       break;
     default:
-      break;
+      std::cerr << "Unknown key event action: " << action << std::endl;
+      return;
   }
   auto message = JsonMessageCodec::GetInstance().EncodeMessage(args);
   messenger_->Send(channel_, message->data(), message->size());

library/linux/src/internal/key_event_handler.h

@@ -11,39 +11,34 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef LIBRARY_LINUX_SRC_INTERNAL_KEY_EVENT_PLUGIN_H_
-#define LIBRARY_LINUX_SRC_INTERNAL_kEY_EVENT_PLUGIN_H_
+#ifndef LIBRARY_LINUX_SRC_INTERNAL_KEY_EVENT_HANDLER_H_
+#define LIBRARY_LINUX_SRC_INTERNAL_kEY_EVENT_HANDLER_H_
 
 #include "library/linux/include/flutter_desktop_embedding/binary_messenger.h"
 #include "library/linux/src/internal/keyboard_hook_handler.h"
 
-#include <memory>
-
 namespace flutter_desktop_embedding {
+
 // Implements a KeyboardHookHandler
 //
 // Handles key events and forwards them to the Flutter engine.
 class KeyEventHandler : public KeyboardHookHandler {
  public:
-  explicit KeyEventHandler();
+  explicit KeyEventHandler(const BinaryMessenger *messenger);
   virtual ~KeyEventHandler();
 
   // KeyboardHookHandler.
   void KeyboardHook(GLFWwindow *window, int key, int scancode, int action,
                     int mods) override;
-
-  // KeyboardHookHandler.
   void CharHook(GLFWwindow *window, unsigned int code_point) override;
 
+ private:
   // Binds this plugin to the given caller-owned binary messenger. It must
   // remain valid for the life of the plugin.
-  void SetBinaryMessenger(BinaryMessenger *messenger);
-
- private:
   const BinaryMessenger *messenger_;
   std::string channel_;
 };
 
 }  // namespace flutter_desktop_embedding
 
-#endif  // LIBRARY_LINUX_SRC_INTERNAL_KEY_EVENT_PLUGIN_H_
+#endif  // LIBRARY_LINUX_SRC_INTERNAL_KEY_EVENT_HANDLER_H_