Use kBadArgumentsError

Author: hbatagelo

engine/src/flutter/shell/platform/windows/windowing_handler.cc

@@ -31,7 +31,7 @@ constexpr char kTitleKey[] = "title";
 constexpr char kViewIdKey[] = "viewId";
 
 // Error codes used for responses.
-constexpr char kInvalidValueError[] = "Invalid Value";
+constexpr char kBadArgumentsError[] = "Bad Arguments";
 constexpr char kUnavailableError[] = "Unavailable";
 
 // Retrieves the value associated with |key| from |map|, ensuring it matches
@@ -48,7 +48,7 @@ std::pair<std::optional<T>, bool> GetSingleValueForKeyOrSendError(
     flutter::MethodResult<>& result) {
   auto const it = map->find(flutter::EncodableValue(key));
   if (it == map->end()) {
-    result.Error(kInvalidValueError,
+    result.Error(kBadArgumentsError,
                  "Map does not contain required '" + key + "' key.");
     return {std::nullopt, false};
   }
@@ -59,7 +59,7 @@ std::pair<std::optional<T>, bool> GetSingleValueForKeyOrSendError(
     return {std::nullopt, true};
   }
 
-  result.Error(kInvalidValueError, "Value for '" + key +
+  result.Error(kBadArgumentsError, "Value for '" + key +
                                        "' key must be of type '" +
                                        typeid(T).name() + "'.");
   return {std::nullopt, false};
@@ -81,7 +81,7 @@ std::pair<std::optional<std::vector<T>>, bool> GetListOfValuesForKeyOrSendError(
     flutter::MethodResult<>& result) {
   auto const it = map->find(flutter::EncodableValue(key));
   if (it == map->end()) {
-    result.Error(kInvalidValueError,
+    result.Error(kBadArgumentsError,
                  "Map does not contain required '" + key + "' key.");
     return {std::nullopt, false};
   }
@@ -91,7 +91,7 @@ std::pair<std::optional<std::vector<T>>, bool> GetListOfValuesForKeyOrSendError(
   if (auto const* const array =
           std::get_if<std::vector<flutter::EncodableValue>>(&it->second)) {
     if (Size && array->size() != Size) {
-      result.Error(kInvalidValueError, "Array for '" + key +
+      result.Error(kBadArgumentsError, "Array for '" + key +
                                            "' key must have " +
                                            std::to_string(Size) + " values.");
       return {std::nullopt, false};
@@ -104,7 +104,7 @@ std::pair<std::optional<std::vector<T>>, bool> GetListOfValuesForKeyOrSendError(
       if (std::holds_alternative<T>(value)) {
         decoded_values.push_back(std::get<T>(value));
       } else {
-        result.Error(kInvalidValueError,
+        result.Error(kBadArgumentsError,
                      "Array for '" + key +
                          "' key must only have values of type '" +
                          typeid(T).name() + "'.");
@@ -114,7 +114,7 @@ std::pair<std::optional<std::vector<T>>, bool> GetListOfValuesForKeyOrSendError(
     return {std::move(decoded_values), true};
   }
 
-  result.Error(kInvalidValueError,
+  result.Error(kBadArgumentsError,
                "Value for key '" + key + "' key must be an array.");
   return {std::nullopt, false};
 }
@@ -160,7 +160,7 @@ void WindowingHandler::HandleCreateWindow(WindowArchetype archetype,
   auto const* const arguments = call.arguments();
   auto const* const map = std::get_if<EncodableMap>(arguments);
   if (!map) {
-    result.Error(kInvalidValueError, "Method call argument is not a map.");
+    result.Error(kBadArgumentsError, "Method call argument is not a map.");
     return;
   }
 
@@ -171,7 +171,7 @@ void WindowingHandler::HandleCreateWindow(WindowArchetype archetype,
           GetListOfValuesForKeyOrSendError<double, 2>(kSizeKey, map, result);
       success) {
     if (!size_list.has_value()) {
-      result.Error(kInvalidValueError, "Value for the '" +
+      result.Error(kBadArgumentsError, "Value for the '" +
                                            std::string(kSizeKey) +
                                            "' key must not be null.");
       return;
@@ -254,7 +254,7 @@ void WindowingHandler::HandleModifyWindow(WindowArchetype archetype,
   auto const* const arguments = call.arguments();
   auto const* const map = std::get_if<EncodableMap>(arguments);
   if (!map) {
-    result.Error(kInvalidValueError, "Method call argument is not a map.");
+    result.Error(kBadArgumentsError, "Method call argument is not a map.");
     return;
   }
 
@@ -266,7 +266,7 @@ void WindowingHandler::HandleModifyWindow(WindowArchetype archetype,
           GetSingleValueForKeyOrSendError<int>(kViewIdKey, map, result);
       success) {
     if (!data.has_value()) {
-      result.Error(kInvalidValueError, "Value for the '" +
+      result.Error(kBadArgumentsError, "Value for the '" +
                                            std::string(kViewIdKey) +
                                            "' key must not be null.");
       return;
@@ -305,7 +305,7 @@ void WindowingHandler::HandleModifyWindow(WindowArchetype archetype,
   }
 
   if (!controller_->ModifyHostWindow(view_id, settings)) {
-    result.Error(kInvalidValueError, "Can't find window with view ID " +
+    result.Error(kBadArgumentsError, "Can't find window with view ID " +
                                          std::to_string(view_id) + ".");
   }
 
@@ -317,7 +317,7 @@ void WindowingHandler::HandleDestroyWindow(MethodCall<> const& call,
   auto const* const arguments = call.arguments();
   auto const* const map = std::get_if<EncodableMap>(arguments);
   if (!map) {
-    result.Error(kInvalidValueError, "Method call argument is not a map.");
+    result.Error(kBadArgumentsError, "Method call argument is not a map.");
     return;
   }
 
@@ -326,19 +326,19 @@ void WindowingHandler::HandleDestroyWindow(MethodCall<> const& call,
           GetSingleValueForKeyOrSendError<int>(kViewIdKey, map, result);
       success) {
     if (!view_id_opt.has_value()) {
-      result.Error(kInvalidValueError, "Value for the '" +
+      result.Error(kBadArgumentsError, "Value for the '" +
                                            std::string(kViewIdKey) +
                                            "' key must not be null.");
       return;
     }
     if (*view_id_opt < 0) {
-      result.Error(kInvalidValueError,
+      result.Error(kBadArgumentsError,
                    "Value for '" + std::string(kViewIdKey) + "' (" +
                        std::to_string(*view_id_opt) + ") cannot be negative.");
       return;
     }
     if (!controller_->DestroyHostWindow(*view_id_opt)) {
-      result.Error(kInvalidValueError, "Can't find window with view ID " +
+      result.Error(kBadArgumentsError, "Can't find window with view ID " +
                                            std::to_string(*view_id_opt) + ".");
       return;
     }