Chromium Code Reviews| Index: public/web/WebFrameWidget.h |
| diff --git a/public/web/WebPopupMenu.h b/public/web/WebFrameWidget.h |
| similarity index 82% |
| copy from public/web/WebPopupMenu.h |
| copy to public/web/WebFrameWidget.h |
| index c7e84e0be6bff420841ccaeca487313a8b2c64df..b5519be4a2abd10d0ba1a65a49387abc237ada13 100644 |
| --- a/public/web/WebPopupMenu.h |
| +++ b/public/web/WebFrameWidget.h |
| @@ -1,5 +1,5 @@ |
| /* |
| - * Copyright (C) 2009 Google Inc. All rights reserved. |
| + * Copyright (C) 2014 Google Inc. All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions are |
| @@ -28,19 +28,24 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#ifndef WebPopupMenu_h |
| -#define WebPopupMenu_h |
| +#ifndef WebFrameWidget_h |
| +#define WebFrameWidget_h |
| #include "../platform/WebCommon.h" |
| -#include "WebWidget.h" |
| +#include "public/web/WebWidget.h" |
| namespace blink { |
| +class Page; |
|
Nate Chapin
2014/12/10 19:19:03
Page shouldn't be forward declared in public/
kenrb
2014/12/11 20:21:22
Done.
|
| +class WebLocalFrame; |
| +class WebView; |
| class WebWidgetClient; |
| -class WebPopupMenu : public WebWidget { |
| +class WebFrameWidget : public WebWidget { |
| public: |
| - BLINK_EXPORT static WebPopupMenu* create(WebWidgetClient*); |
| + BLINK_EXPORT static WebFrameWidget* create(WebWidgetClient*, WebView*); |
| + |
| + virtual void setLocalRoot(WebLocalFrame*) { } |
|
dcheng
2014/12/10 21:00:59
This is something we implement only inside Blink r
kenrb
2014/12/11 20:21:22
I don't think that works. This header gets include
dcheng
2014/12/11 23:31:45
Pure virtual is fine. WebFrame.h is composed of a
|
| }; |
| } // namespace blink |