Index: chrome/browser/extensions/api/tabs/windows_util.h |
diff --git a/chrome/browser/extensions/api/tabs/windows_util.h b/chrome/browser/extensions/api/tabs/windows_util.h |
index 0e0a8d2ff4a8bccc44e50e90379766500e65f8e5..873b4e691a414a8f5eb5085ea6787f3c5d0f84b2 100644 |
--- a/chrome/browser/extensions/api/tabs/windows_util.h |
+++ b/chrome/browser/extensions/api/tabs/windows_util.h |
@@ -5,24 +5,55 @@ |
#ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_WINDOWS_UTIL_H__ |
#define CHROME_BROWSER_EXTENSIONS_API_TABS_WINDOWS_UTIL_H__ |
+#include "chrome/browser/extensions/window_controller_list.h" |
+#include "chrome/common/extensions/api/windows.h" |
+ |
class UIThreadExtensionFunction; |
+namespace content { |
+class BrowserContext; |
+} |
+ |
namespace extensions { |
+class Extension; |
class WindowController; |
} |
namespace windows_util { |
+// Returns the default filter to be used when operating on the windows |
+// from WindowControllerList when using the chrome.windows APIs. |
+extensions::WindowTypeFilter GetDefaultWindowTypeFilter(); |
not at google - send to devlin
2015/08/04 18:05:03
It would be better for the enum and the utils that
llandwerlin-old
2015/08/05 11:01:22
Done, much simpler indeed. Thanks.
|
+ |
+// Returns a filter allowing all window types to be manipulated |
+// through the chrome.windows APIs. |
+extensions::WindowTypeFilter GetAllWindowTypeFilter(); |
not at google - send to devlin
2015/08/04 18:05:03
GetAllWindowTypesFilter.
llandwerlin-old
2015/08/05 11:01:22
Since you proposed MatchesFilter, I renamed these
|
+ |
+// Returns true if the window type of |controller| matches the |filter|. |
+bool WindowMatchesTypeFilter(const extensions::WindowController* controller, |
+ extensions::WindowTypeFilter filter); |
not at google - send to devlin
2015/08/04 18:05:03
A method on extensions::WindowController called "M
llandwerlin-old
2015/08/05 11:01:22
Done.
|
+ |
+// Converts an array of window types given by the chrome.windows APIs |
+// to a WindowTypeFilter. |
+extensions::WindowTypeFilter WindowTypeFilterFromWindowTypes( |
+ const std::vector<extensions::api::windows::WindowType>& types); |
+ |
// Populates |controller| for given |window_id|. If the window is not found, |
// returns false and sets UIThreadExtensionFunction error_. |
bool GetWindowFromWindowID(UIThreadExtensionFunction* function, |
int window_id, |
+ extensions::WindowTypeFilter filter, |
extensions::WindowController** controller); |
// Returns true if |function| (and the profile and extension that it was |
// invoked from) can operate on the window wrapped by |window_controller|. |
+// If |all_window_types| is set this function will return true for any |
+// kind of window (including app and devtools), otherwise it will |
+// return true only for normal browser windows as well as windows |
+// created by the extension. |
bool CanOperateOnWindow(const UIThreadExtensionFunction* function, |
- const extensions::WindowController* controller); |
+ const extensions::WindowController* controller, |
+ extensions::WindowTypeFilter filter); |
} // namespace windows_util |