| Index: content/public/common/window_container_type.h
|
| diff --git a/content/public/common/window_container_type.h b/content/public/common/window_container_type.h
|
| index 3c9e728f959bf5a1c0b22e2ffc0608ffed118259..06f02678d445cf238f15148cd813c0fa077e4f77 100644
|
| --- a/content/public/common/window_container_type.h
|
| +++ b/content/public/common/window_container_type.h
|
| @@ -5,28 +5,26 @@
|
| #ifndef CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
|
| #define CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
|
|
|
| +#include "content/common/content_export.h"
|
| +#include "content/public/common/window_container_type.mojom.h"
|
| +
|
| namespace blink {
|
|
|
| struct WebWindowFeatures;
|
|
|
| }
|
|
|
| -// "Container" types which can be requested via the window.open feature
|
| -// string.
|
| -enum WindowContainerType {
|
| - // A window shown in popup or tab.
|
| - WINDOW_CONTAINER_TYPE_NORMAL = 0,
|
| +using WindowContainerType = content::mojom::WindowContainerType;
|
|
|
| - // A window run as a hidden "background" page.
|
| - WINDOW_CONTAINER_TYPE_BACKGROUND,
|
| +// TODO(rockot): Remove these duplicate definitions by updating all references
|
| +// to point directly to the mojom enum values.
|
| +extern const WindowContainerType CONTENT_EXPORT WINDOW_CONTAINER_TYPE_NORMAL;
|
|
|
| - // A window run as a hidden "background" page that wishes to be started
|
| - // upon browser launch and run beyond the lifetime of the pages that
|
| - // reference it.
|
| - WINDOW_CONTAINER_TYPE_PERSISTENT,
|
| +extern const WindowContainerType CONTENT_EXPORT
|
| +WINDOW_CONTAINER_TYPE_BACKGROUND;
|
|
|
| - WINDOW_CONTAINER_TYPE_MAX_VALUE = WINDOW_CONTAINER_TYPE_PERSISTENT,
|
| -};
|
| +extern const WindowContainerType CONTENT_EXPORT
|
| +WINDOW_CONTAINER_TYPE_PERSISTENT;
|
|
|
| // Conversion function:
|
| WindowContainerType WindowFeaturesToContainerType(
|
|
|