extensions: windows: list all windows from the current profile

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 248 matching lines @@
   }
 }
 
 // Windows ---------------------------------------------------------------------
 
 bool WindowsGetFunction::RunSync() {
   scoped_ptr<windows::Get::Params> params(windows::Get::Params::Create(*args_));
   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;
   }
 
   if (populate_tabs)
     SetResult(controller->CreateWindowValueWithTabs(extension()));
   else
     SetResult(controller->CreateWindowValue());
   return true;
 }
 
 bool WindowsGetCurrentFunction::RunSync() {
   scoped_ptr<windows::GetCurrent::Params> params(
       windows::GetCurrent::Params::Create(*args_));
   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)
     SetResult(controller->CreateWindowValueWithTabs(extension()));
   else
     SetResult(controller->CreateWindowValue());
   return true;
 }
 
 bool WindowsGetLastFocusedFunction::RunSync() {
   scoped_ptr<windows::GetLastFocused::Params> params(
       windows::GetLastFocused::Params::Create(*args_));
   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]

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.

 
-  // 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()) {
+  // 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
     SetResult(controller->CreateWindowValue());
   return true;
 }
 
 bool WindowsGetAllFunction::RunSync() {
   scoped_ptr<windows::GetAll::Params> params(
       windows::GetAll::Params::Create(*args_));
   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 =
       WindowControllerList::GetInstance()->windows();
   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()));
     else
       window_list->Append((*iter)->CreateWindowValue());
   }
   SetResult(window_list);
   return true;
 }
 
@@ skipping 325 matching lines @@
 
   return true;
 }
 
 bool WindowsUpdateFunction::RunSync() {
   scoped_ptr<windows::Update::Params> params(
       windows::Update::Params::Create(*args_));
   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 =
       ConvertToWindowShowState(params->update_info.state);
 
   if (show_state != ui::SHOW_STATE_FULLSCREEN &&
       show_state != ui::SHOW_STATE_DEFAULT)
     controller->SetFullscreenMode(false, extension()->url());
 
   switch (show_state) {
@@ skipping 80 matching lines @@
 
   return true;
 }
 
 bool WindowsRemoveFunction::RunSync() {
   scoped_ptr<windows::Remove::Params> params(
       windows::Remove::Params::Create(*args_));
   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;
   if (!controller->CanClose(&reason)) {
     if (reason == WindowController::REASON_NOT_EDITABLE)
       error_ = keys::kTabStripNotEditableError;
     return false;
   }
   controller->window()->Close();
   return true;
@@ skipping 1218 matching lines @@
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
   zoom_settings.default_zoom_factor.reset(new double(
       content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));
 
   results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions