diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-11-21 14:09:57 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-11-29 15:14:36 +0100 |
commit | eb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch) | |
tree | 2c7c940e1dbee81b89d935626110816b494aa32c /chromium/content/common/browser_plugin | |
parent | 9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff) |
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/common/browser_plugin')
-rw-r--r-- | chromium/content/common/browser_plugin/browser_plugin_constants.cc | 4 | ||||
-rw-r--r-- | chromium/content/common/browser_plugin/browser_plugin_constants.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chromium/content/common/browser_plugin/browser_plugin_constants.cc b/chromium/content/common/browser_plugin/browser_plugin_constants.cc index 6da58e96c53..9ba17bcaeec 100644 --- a/chromium/content/common/browser_plugin/browser_plugin_constants.cc +++ b/chromium/content/common/browser_plugin/browser_plugin_constants.cc @@ -54,6 +54,10 @@ const char kLastUnlockedBySelf[] = "lastUnlockedBySelf"; const char kMessageText[] = "messageText"; const char kMessageType[] = "messageType"; const char kName[] = "name"; +const char kNewHeight[] = "newHeight"; +const char kNewWidth[] = "newWidth"; +const char kOldHeight[] = "oldHeight"; +const char kOldWidth[] = "oldWidth"; const char kPermission[] = "permission"; const char kPermissionTypeDialog[] = "dialog"; const char kPermissionTypeDownload[] = "download"; diff --git a/chromium/content/common/browser_plugin/browser_plugin_constants.h b/chromium/content/common/browser_plugin/browser_plugin_constants.h index 8e911f04ef2..7776a82c309 100644 --- a/chromium/content/common/browser_plugin/browser_plugin_constants.h +++ b/chromium/content/common/browser_plugin/browser_plugin_constants.h @@ -42,6 +42,9 @@ extern const char kAttributeName[]; extern const char kAttributePartition[]; extern const char kAttributeSrc[]; +// Events. +extern const char kEventSizeChanged[]; + // Parameters/properties on events. extern const char kDefaultPromptText[]; extern const char kId[]; @@ -51,6 +54,10 @@ extern const char kLastUnlockedBySelf[]; extern const char kMessageText[]; extern const char kMessageType[]; extern const char kName[]; +extern const char kNewHeight[]; +extern const char kNewWidth[]; +extern const char kOldHeight[]; +extern const char kOldWidth[]; extern const char kPermission[]; extern const char kPermissionTypeDialog[]; extern const char kPermissionTypeDownload[]; |