| Index: content/renderer/external_popup_menu.h
|
| diff --git a/content/renderer/external_popup_menu.h b/content/renderer/external_popup_menu.h
|
| index 729205fba9f8f971109c251145c2048342cacf54..28d65acbdc2a70bd505f79e5152c7c6b343b90bf 100644
|
| --- a/content/renderer/external_popup_menu.h
|
| +++ b/content/renderer/external_popup_menu.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/basictypes.h"
|
| #include "third_party/WebKit/public/web/WebExternalPopupMenu.h"
|
| #include "third_party/WebKit/public/web/WebPopupMenuInfo.h"
|
| +#include "ui/gfx/point.h"
|
|
|
| namespace WebKit {
|
| class WebExternalPopupMenuClient;
|
| @@ -26,6 +27,8 @@ class ExternalPopupMenu : public WebKit::WebExternalPopupMenu {
|
|
|
| virtual ~ExternalPopupMenu() {}
|
|
|
| + void SetOriginScaleForEmulation(float scale);
|
| +
|
| #if defined(OS_MACOSX)
|
| // Called when the user has selected an item. |selected_item| is -1 if the
|
| // user canceled the popup.
|
| @@ -46,6 +49,10 @@ class ExternalPopupMenu : public WebKit::WebExternalPopupMenu {
|
| WebKit::WebPopupMenuInfo popup_menu_info_;
|
| WebKit::WebExternalPopupMenuClient* popup_menu_client_;
|
|
|
| + // Popups may be displaced when screen metrics emulation is enabled.
|
| + // This scale is used to properly adjust popup position.
|
| + float origin_scale_for_emulation_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ExternalPopupMenu);
|
| };
|
|
|
|
|