| 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..a4033d1cb0c232d2169ce25602140e3809f0139a 100644
|
| --- a/third_party/WebKit/public/web/WebWindowFeatures.h
|
| +++ b/third_party/WebKit/public/web/WebWindowFeatures.h
|
| @@ -54,13 +54,9 @@ struct WebWindowFeatures {
|
| 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;
|
| + bool background;
|
| + bool persistent;
|
|
|
| WebWindowFeatures()
|
| : x(0),
|
| @@ -74,11 +70,9 @@ struct WebWindowFeatures {
|
| 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) {}
|
| + background(false),
|
| + persistent(false) {}
|
|
|
| #if BLINK_IMPLEMENTATION
|
| WebWindowFeatures(const WindowFeatures& f)
|
| @@ -93,12 +87,9 @@ struct WebWindowFeatures {
|
| 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) {}
|
| + background(f.background),
|
| + persistent(f.persistent) {}
|
|
|
| operator WindowFeatures() const {
|
| WindowFeatures result;
|
| @@ -113,13 +104,9 @@ struct WebWindowFeatures {
|
| 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]);
|
| + result.background = background;
|
| + result.persistent = persistent;
|
| return result;
|
| }
|
| #endif
|
|
|