Chromium Code Reviews| Index: third_party/WebKit/public/web/WebWindowFeatures.h |
| diff --git a/third_party/WebKit/public/web/WebWindowFeatures.h b/third_party/WebKit/public/web/WebWindowFeatures.h |
| index f4ede783f0f07823ac22a1bfe4682b53a36efbd9..fdb6b0d133e8e6efdeb968f010a47c5a0b01109a 100644 |
| --- a/third_party/WebKit/public/web/WebWindowFeatures.h |
| +++ b/third_party/WebKit/public/web/WebWindowFeatures.h |
| @@ -31,98 +31,28 @@ |
| #ifndef WebWindowFeatures_h |
| #define WebWindowFeatures_h |
| -#include "public/platform/WebCommon.h" |
| -#include "public/platform/WebString.h" |
| -#include "public/platform/WebVector.h" |
| - |
| -#if BLINK_IMPLEMENTATION |
| -#include "core/page/WindowFeatures.h" |
| -#endif |
| - |
| namespace blink { |
| struct WebWindowFeatures { |
| - float x; |
| - bool x_set; |
| - float y; |
| - bool y_set; |
| - float width; |
| - bool width_set; |
| - float height; |
| - bool height_set; |
| - |
| - bool menu_bar_visible; |
| - bool status_bar_visible; |
| - bool tool_bar_visible; |
| - bool location_bar_visible; |
| - bool scrollbars_visible; |
| - bool resizable; |
| - |
| - bool fullscreen; |
| - bool dialog; |
| - WebVector<WebString> additional_features; |
| - |
| - WebWindowFeatures() |
| - : x(0), |
| - x_set(false), |
| - y(0), |
| - y_set(false), |
| - width(0), |
| - width_set(false), |
| - height(0), |
| - height_set(false), |
| - menu_bar_visible(true), |
| - status_bar_visible(true), |
| - tool_bar_visible(true), |
| - location_bar_visible(true), |
| - scrollbars_visible(true), |
| - resizable(true), |
| - fullscreen(false), |
| - dialog(false) {} |
| - |
| -#if BLINK_IMPLEMENTATION |
| - WebWindowFeatures(const WindowFeatures& f) |
| - : x(f.x), |
| - x_set(f.x_set), |
| - y(f.y), |
| - y_set(f.y_set), |
| - width(f.width), |
| - width_set(f.width_set), |
| - height(f.height), |
| - height_set(f.height_set), |
| - menu_bar_visible(f.menu_bar_visible), |
| - status_bar_visible(f.status_bar_visible), |
| - tool_bar_visible(f.tool_bar_visible), |
| - location_bar_visible(f.location_bar_visible), |
| - scrollbars_visible(f.scrollbars_visible), |
| - resizable(f.resizable), |
| - fullscreen(f.fullscreen), |
| - dialog(f.dialog), |
| - additional_features(f.additional_features) {} |
| - |
| - operator WindowFeatures() const { |
| - WindowFeatures result; |
| - result.x = x; |
| - result.x_set = x_set; |
| - result.y = y; |
| - result.y_set = y_set; |
| - result.width = width; |
| - result.width_set = width_set; |
| - result.height = height; |
| - result.height_set = height_set; |
| - result.menu_bar_visible = menu_bar_visible; |
| - result.status_bar_visible = status_bar_visible; |
| - result.tool_bar_visible = tool_bar_visible; |
| - result.location_bar_visible = location_bar_visible; |
| - result.scrollbars_visible = scrollbars_visible; |
| - result.resizable = resizable; |
| - result.fullscreen = fullscreen; |
| - result.dialog = dialog; |
| - for (size_t i = 0; i < additional_features.size(); ++i) |
| - result.additional_features.push_back(additional_features[i]); |
| - return result; |
| - } |
| -#endif |
| + float x = 0; |
| + bool x_set = false; |
| + float y = 0; |
| + bool y_set = false; |
| + float width = 0; |
| + bool width_set = false; |
| + float height = 0; |
| + bool height_set = false; |
| + |
| + bool menu_bar_visible = true; |
| + bool status_bar_visible = true; |
| + // This can be set based on "locationbar" or "toolbar" in a window features |
| + // string, we don't distinguish between the two. |
| + bool tool_bar_visible = true; |
| + bool scrollbars_visible = true; |
| + |
| + bool noopener = false; |
| + bool background = false; |
|
dcheng
2017/06/02 18:46:22
From a layering perspective, I think it might be b
|
| + bool persistent = false; |
| }; |
| } // namespace blink |