summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 03:03:09 +0000
committerpaulg@google.com <paulg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 03:03:09 +0000
commit3f64e5af06d2506e1e9886fc834775f2169f21be (patch)
tree6a23effda23684362a666dc02efa3a337fd40f3c /chrome/renderer
parent1f73c7ff048b6735e5cf2c36d77ac0cd175d5fb8 (diff)
downloadchromium_src-3f64e5af06d2506e1e9886fc834775f2169f21be.zip
chromium_src-3f64e5af06d2506e1e9886fc834775f2169f21be.tar.gz
chromium_src-3f64e5af06d2506e1e9886fc834775f2169f21be.tar.bz2
Chrome side of the WebKit popup changes.
Implements HTML select popups on Mac OS X as native Cocoa controls. BUG=5095 (http://crbug.com/5095) Review URL: http://codereview.chromium.org/67018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_widget.cc10
-rw-r--r--chrome/renderer/render_widget.h12
2 files changed, 11 insertions, 11 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index ba82739..7f698cf 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -564,11 +564,11 @@ void RenderWidget::Show(WebWidget* webwidget,
}
}
-void RenderWidget::ShowWithItems(WebWidget* webwidget,
- const WebRect& bounds,
- int item_height,
- int selected_index,
- const std::vector<MenuItem>& items) {
+void RenderWidget::ShowAsPopupWithItems(WebWidget* webwidget,
+ const WebRect& bounds,
+ int item_height,
+ int selected_index,
+ const std::vector<WebMenuItem>& items) {
// TODO(paulg): Implement this for Mac HTML select menus in Chromium, bug
// number: http://crbug.com/8389
}
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 32c2405..9dbfcbb 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -69,16 +69,16 @@ class RenderWidget : public IPC::Channel::Listener,
const WebKit::WebRect& rect);
virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
const WebKit::WebRect& clip_rect);
- virtual void SetCursor(WebWidget* webwidget, const WebCursor& cursor);
virtual void Show(WebWidget* webwidget, WindowOpenDisposition disposition);
- virtual void ShowWithItems(WebWidget* webwidget,
- const WebKit::WebRect& bounds,
- int item_height,
- int selected_index,
- const std::vector<MenuItem>& items);
+ virtual void ShowAsPopupWithItems(WebWidget* webwidget,
+ const WebKit::WebRect& bounds,
+ int item_height,
+ int selected_index,
+ const std::vector<WebMenuItem>& items);
virtual void CloseWidgetSoon(WebWidget* webwidget);
virtual void Focus(WebWidget* webwidget);
virtual void Blur(WebWidget* webwidget);
+ virtual void SetCursor(WebWidget* webwidget, const WebCursor& cursor);
virtual void GetWindowRect(WebWidget* webwidget, WebKit::WebRect* rect);
virtual void SetWindowRect(WebWidget* webwidget,
const WebKit::WebRect& rect);