diff options
| author | jcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 17:03:12 +0000 |
|---|---|---|
| committer | jcivelli@google.com <jcivelli@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 17:03:12 +0000 |
| commit | 3e2b375b56172a400f75060bd2a827375ea44fea (patch) | |
| tree | 59f9864d0cf85c5901d686e3757940f8db561328 /chrome/renderer/render_widget.h | |
| parent | 0d0524fea0ce2adb9aa132f90b63c7deb5410b1f (diff) | |
| download | chromium_src-3e2b375b56172a400f75060bd2a827375ea44fea.zip chromium_src-3e2b375b56172a400f75060bd2a827375ea44fea.tar.gz chromium_src-3e2b375b56172a400f75060bd2a827375ea44fea.tar.bz2 | |
Adding the new WebPopupType to the RenderWidget creation.
BUG=None
TEST=Tests that all popups (select popup, autofill, browser actions, bookmark bubble...)
work as expected and get the focus correctly.
Review URL: http://codereview.chromium.org/1523013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_widget.h')
| -rw-r--r-- | chrome/renderer/render_widget.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index 4781790..2fdc1e5 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -20,6 +20,7 @@ #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebCompositionCommand.h" +#include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" #include "third_party/WebKit/WebKit/chromium/public/WebWidgetClient.h" @@ -48,7 +49,7 @@ class RenderWidget : public IPC::Channel::Listener, // RenderThreadBase implementation, mostly commonly RenderThread::current(). static RenderWidget* Create(int32 opener_id, RenderThreadBase* render_thread, - bool activatable); + WebKit::WebPopupType popup_type); // Called after Create to configure a RenderWidget to be rendered by the host // as a popup menu with the given data. @@ -110,7 +111,8 @@ class RenderWidget : public IPC::Channel::Listener, // without ref-counting is an error. friend class base::RefCounted<RenderWidget>; - RenderWidget(RenderThreadBase* render_thread, bool activatable); + RenderWidget(RenderThreadBase* render_thread, + WebKit::WebPopupType popup_type); virtual ~RenderWidget(); // Initializes this view with the given opener. CompleteInit must be called @@ -298,8 +300,8 @@ class RenderWidget : public IPC::Channel::Listener, bool ime_control_updated_; bool ime_control_busy_; - // Whether the window for this RenderWidget can be activated. - bool activatable_; + // The kind of popup this widget represents, NONE if not a popup. + WebKit::WebPopupType popup_type_; // Holds all the needed plugin window moves for a scroll. typedef std::vector<webkit_glue::WebPluginGeometry> WebPluginGeometryVector; |