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 98 matching lines @@
 namespace extensions {
 
 namespace windows = api::windows;
 namespace keys = tabs_constants;
 namespace tabs = api::tabs;
 
 using api::extension_types::InjectDetails;
 
 namespace {
 
+template <typename T>
+class ApiParameterExtractor {
+ public:
+  explicit ApiParameterExtractor(T* params) : params_(params) {}
+  ~ApiParameterExtractor() {}
+
+  bool populate_tabs() {
+    if (params_->get_info.get() && params_->get_info->populate.get())
+      return *params_->get_info->populate;
+    return false;
+  }
+
+  WindowController::TypeFilter type_filters() {
+    if (params_->get_info.get() && params_->get_info->window_types.get())
+      return WindowController::GetFilterFromWindowTypes(
+          *params_->get_info->window_types.get());
+    return WindowController::GetDefaultWindowFilter();
+  }
+
+ private:
+  T* params_;
+};
+
 bool GetBrowserFromWindowID(ChromeUIThreadExtensionFunction* function,
                             int window_id,
                             Browser** browser) {
   std::string error;
   Browser* result;
   result =
       ExtensionTabUtil::GetBrowserFromWindowID(function, window_id, &error);
   if (!result) {
     function->SetError(error);
     return false;
@@ skipping 129 matching lines @@
       break;
   }
 }
 
 // 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;
-
+  ApiParameterExtractor<windows::Get::Params> extractor(params.get());
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this,
-                                           params->window_id,
-                                           &controller)) {
+  if (!windows_util::GetWindowFromWindowID(
+          this, params->window_id, extractor.type_filters(), &controller)) {
     return false;
   }
 
-  if (populate_tabs)
+  if (extractor.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;
-
+  ApiParameterExtractor<windows::GetCurrent::Params> extractor(params.get());
   WindowController* controller;
-  if (!windows_util::GetWindowFromWindowID(this,
-                                           extension_misc::kCurrentWindowId,
-                                           &controller)) {
+  if (!windows_util::GetWindowFromWindowID(
+          this, extension_misc::kCurrentWindowId, extractor.type_filters(),
+          &controller)) {
     return false;
   }
-  if (populate_tabs)
+  if (extractor.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;
-
-  // 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()) {
+  ApiParameterExtractor<windows::GetLastFocused::Params> extractor(
+      params.get());
+  // 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,
+                                         extractor.type_filters())) {
+      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)
+  if (extractor.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;
-
+  ApiParameterExtractor<windows::GetAll::Params> extractor(params.get());
   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,
+                                          extractor.type_filters()))
       continue;
-    if (populate_tabs)
+    if (extractor.populate_tabs())
       window_list->Append((*iter)->CreateWindowValueWithTabs(extension()));
     else
       window_list->Append((*iter)->CreateWindowValue());
   }
   SetResult(window_list);
   return true;
 }
 
 bool WindowsCreateFunction::ShouldOpenIncognitoWindow(
     const windows::Create::Params::CreateData* create_data,
@@ skipping 323 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, WindowController::GetAllWindowFilter(),
+          &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) {
     case ui::SHOW_STATE_MINIMIZED:
@@ skipping 79 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, WindowController::GetDefaultWindowFilter(),
+          &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