Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 1055933009: Validate windows.create API's state input parameter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: focus Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..322cf165234b6509d6d901e8c8e77804ba53feaf 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -198,6 +198,35 @@ 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;
+
+ bool has_bound = create_data->left || create_data->top ||
+ create_data->width || create_data->height;
+ bool is_panel =
+ create_data->type == windows::CreateType::CREATE_TYPE_PANEL ||
+ create_data->type == windows::CreateType::CREATE_TYPE_DETACHED_PANEL;
+
+ switch (create_data->state) {
+ case windows::WINDOW_STATE_MINIMIZED:
+ // If minimised, default focused state should be unfocused.
+ return !(create_data->focused && *create_data->focused) && !has_bound &&
+ !is_panel;
+ case windows::WINDOW_STATE_MAXIMIZED:
+ case windows::WINDOW_STATE_FULLSCREEN:
+ // If maximised/fullscreen, default focused state should be focused.
+ return !(create_data->focused && !*create_data->focused) && !has_bound &&
+ !is_panel;
+ case windows::WINDOW_STATE_NORMAL:
+ case windows::WINDOW_STATE_NONE:
+ return true;
+ }
+ NOTREACHED();
+ return true;
+}
+
} // namespace
void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
@@ -421,6 +450,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;
« no previous file with comments | « no previous file | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698