extensions: windows: list all windows from the current profile

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 a2d5aab3d91c1cdfbabb309e4c724b2a46a8ad55..a76dccbf1e66672592cec69d941d593bd2e6c548 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -266,13 +266,19 @@ bool WindowsGetFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool populate_tabs = false;
-  if (params->get_info.get() && params->get_info->populate.get())
-    populate_tabs = *params->get_info->populate;
+  std::vector<api::windows::WindowType>* type_filter = nullptr;
+  if (params->get_info.get()) {
+    if (params->get_info->populate.get())
+      populate_tabs = *params->get_info->populate;
+    type_filter = params->get_info->window_types.get();
+  }
 
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this,
-                                           params->window_id,
-                                           &controller)) {
+  if (!windows_util::GetWindowFromWindowID(
+          this, params->window_id,
+          type_filter ? *type_filter
+                      : windows_util::GetDefaultWindowTypeFilters(),
+          &controller)) {
     return false;
   }
 
@@ -289,13 +295,19 @@ bool WindowsGetCurrentFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool populate_tabs = false;
-  if (params->get_info.get() && params->get_info->populate.get())
-    populate_tabs = *params->get_info->populate;
+  std::vector<api::windows::WindowType>* type_filter = nullptr;
+  if (params->get_info.get()) {
+    if (params->get_info->populate.get())
+      populate_tabs = *params->get_info->populate;
+    type_filter = params->get_info->window_types.get();
+  }
 
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this,
-                                           extension_misc::kCurrentWindowId,
-                                           &controller)) {
+  if (!windows_util::GetWindowFromWindowID(
+          this, extension_misc::kCurrentWindowId,
+          type_filter ? *type_filter
+                      : windows_util::GetDefaultWindowTypeFilters(),
+          &controller)) {
     return false;
   }
   if (populate_tabs)
@@ -311,20 +323,30 @@ bool WindowsGetLastFocusedFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool populate_tabs = false;
-  if (params->get_info.get() && params->get_info->populate.get())
-    populate_tabs = *params->get_info->populate;
-
-  // Note: currently this returns the last active browser. If we decide to
-  // include other window types (e.g. panels), we will need to add logic to
-  // WindowControllerList that mirrors the active behavior of BrowserList.
-  Browser* browser = chrome::FindAnyBrowser(
-      GetProfile(), include_incognito(), chrome::GetActiveDesktop());
-  if (!browser || !browser->window()) {
+  std::vector<api::windows::WindowType>* type_filter = nullptr;
+  if (params->get_info.get()) {
+    if (params->get_info->populate.get())
+      populate_tabs = *params->get_info->populate;
+    type_filter = params->get_info->window_types.get();
+  }

[stevenjb, 2015/07/30 19:00:37]

Given that we seem to copy/paste the same code three times, maybe wrap this in a
helper function, e.g. GetCommonParams(&populate_tabs, &type_filter) ? That could
also set type_filter to windows_util::GetDefaultWindowTypeFilters() if null and
simplify the rest of the code a bit.

[llandwerlin-old, 2015/07/31 13:58:32]

I can't really use a helper function because the params is a different type for
each extension function.
Added a template class to extract the parameters.

[stevenjb, 2015/07/31 17:27:16]

Ugh, you're right, I missed that. It's too bad we don't (and maybe can't) share
the struct across the API. A template function works though, thanks.

+
+  // The WindowControllerList should contain a list of application,
+  // browser and devtools windows.
+  WindowController* controller = nullptr;
+  for (auto iter : WindowControllerList::GetInstance()->windows()) {
+    if (windows_util::CanOperateOnWindow(
+            this, iter, type_filter
+                            ? *type_filter
+                            : windows_util::GetDefaultWindowTypeFilters())) {
+      controller = iter;
+      if (controller->window()->IsActive())
+        break;  // Use focused window.
+    }
+  }
+  if (!controller) {
     error_ = keys::kNoLastFocusedWindowError;
     return false;
   }
-  WindowController* controller =
-      browser->extension_window_controller();
   if (populate_tabs)
     SetResult(controller->CreateWindowValueWithTabs(extension()));
   else
@@ -338,8 +360,12 @@ bool WindowsGetAllFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool populate_tabs = false;
-  if (params->get_info.get() && params->get_info->populate.get())
-    populate_tabs = *params->get_info->populate;
+  std::vector<api::windows::WindowType>* type_filter = nullptr;
+  if (params->get_info.get()) {
+    if (params->get_info->populate.get())
+      populate_tabs = *params->get_info->populate;
+    type_filter = params->get_info->window_types.get();
+  }

[stevenjb, 2015/07/30 19:00:37]

Four times... :)

[llandwerlin-old, 2015/07/31 13:58:32]

Done.

 
   base::ListValue* window_list = new base::ListValue();
   const WindowControllerList::ControllerList& windows =
@@ -347,7 +373,10 @@ bool WindowsGetAllFunction::RunSync() {
   for (WindowControllerList::ControllerList::const_iterator iter =
            windows.begin();
        iter != windows.end(); ++iter) {
-    if (!windows_util::CanOperateOnWindow(this, *iter))
+    if (!windows_util::CanOperateOnWindow(
+            this, *iter, type_filter
+                             ? *type_filter
+                             : windows_util::GetDefaultWindowTypeFilters()))
       continue;
     if (populate_tabs)
       window_list->Append((*iter)->CreateWindowValueWithTabs(extension()));
@@ -693,8 +722,9 @@ bool WindowsUpdateFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this, params->window_id,
-                                            &controller))
+  if (!windows_util::GetWindowFromWindowID(
+          this, params->window_id, windows_util::GetNoWindowTypeFilters(),
+          &controller))
     return false;
 
   ui::WindowShowState show_state =
@@ -795,8 +825,9 @@ bool WindowsRemoveFunction::RunSync() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this, params->window_id,
-                                           &controller))
+  if (!windows_util::GetWindowFromWindowID(
+          this, params->window_id, windows_util::GetDefaultWindowTypeFilters(),
+          &controller))
     return false;
 
   WindowController::Reason reason;