Validate windows.create API's state input parameter.

chrome/browser/extensions/api/tabs/tabs_api.cc

Index: chrome/browser/extensions/api/tabs/tabs_api.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 3bcf3db1f36819a2804ad06844a2ba1d22171df6..e7c08d955094a42a0d71b4db9b207bb85e23e953 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -198,6 +198,42 @@ ui::WindowShowState ConvertToWindowShowState(windows::WindowState state) {
   return ui::SHOW_STATE_DEFAULT;
 }
 
+bool IsValidStateForWindowsCreateFunction(
+    const windows::Create::Params::CreateData* create_data) {
+  if (!create_data)
+    return true;
+
+  windows::WindowState state = create_data->state;
+  if (create_data->focused) {
+    if (*create_data->focused) {
+      if (state == windows::WINDOW_STATE_MINIMIZED) {
+        return false;
+      }
+    } else {
+      if ((state == windows::WINDOW_STATE_MAXIMIZED ||
+           state == windows::WINDOW_STATE_FULLSCREEN)) {
+        return false;
+      }
+    }
+  }

[not at google - send to devlin, 2015/04/20 16:32:55]

Let's try to make this as compact as possible, it's a lot of code. I *think* it
would be easier to read if you inverted the conditions and used a switch
instead?

bool focused = create_data->focused && *create_data->focused;
bool has_bound = create_data...;
bool is_panel = ...;
switch (state) {
  case MINIMIZED:
    return !focused && !has_bound && ...;
  case MAXIMIZED:
    return focused && !has_bound && ...;
  case ...l
}

[limasdf, 2015/04/22 15:49:33]

Great idea. Done.

+  bool has_bound = create_data->left || create_data->top ||
+                   create_data->width || create_data->height;
+  if (has_bound && (state == windows::WINDOW_STATE_MINIMIZED ||
+                    state == windows::WINDOW_STATE_MAXIMIZED ||
+                    state == windows::WINDOW_STATE_FULLSCREEN)) {
+    return false;
+  }
+  bool is_panel =
+      create_data->type == windows::CreateType::CREATE_TYPE_PANEL ||
+      create_data->type == windows::CreateType::CREATE_TYPE_DETACHED_PANEL;
+  if (is_panel && (state == windows::WINDOW_STATE_MINIMIZED ||
+                   state == windows::WINDOW_STATE_MAXIMIZED ||
+                   state == windows::WINDOW_STATE_FULLSCREEN)) {
+    return false;
+  }
+  return true;
+}
+
 }  // namespace
 
 void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
@@ -421,6 +457,11 @@ bool WindowsCreateFunction::RunSync() {
       return false;
   }
 
+  if (!IsValidStateForWindowsCreateFunction(create_data)) {
+    error_ = keys::kInvalidWindowStateError;
+    return false;
+  }
+
   Profile* window_profile = GetProfile();
   Browser::Type window_type = Browser::TYPE_TABBED;
   bool create_panel = false;