diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 21:01:35 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 21:01:35 +0000 |
| commit | 5376119db8db98303ff177c1ce153e58c742e824 (patch) | |
| tree | 1807b545295f0969572426b93dcb430d396d7347 /remoting | |
| parent | 8ef13715896630c51f1926cfce8a67d7308c05b2 (diff) | |
| download | chromium_src-5376119db8db98303ff177c1ce153e58c742e824.zip chromium_src-5376119db8db98303ff177c1ce153e58c742e824.tar.gz chromium_src-5376119db8db98303ff177c1ce153e58c742e824.tar.bz2 | |
Update Chrome to pull latest PPAPI with new uses of point and size.
This also pulls in the renamed enums from Darin's patch
http://codereview.chromium.org/2900003
TEST=covered by unit tests
BUG=none
Review URL: http://codereview.chromium.org/2925007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/chromoting_plugin.cc | 12 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_entrypoints.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/remoting/client/plugin/chromoting_plugin.cc b/remoting/client/plugin/chromoting_plugin.cc index c5b5b03..a312426 100644 --- a/remoting/client/plugin/chromoting_plugin.cc +++ b/remoting/client/plugin/chromoting_plugin.cc @@ -148,15 +148,15 @@ void ChromotingPlugin::ViewChanged(const PP_Rect& position, bool ChromotingPlugin::HandleEvent(const PP_Event& event) { switch (event.type) { - case PP_Event_Type_MouseDown: - case PP_Event_Type_MouseUp: - case PP_Event_Type_MouseMove: - case PP_Event_Type_MouseEnter: - case PP_Event_Type_MouseLeave: + case PP_EVENT_TYPE_MOUSEDOWN: + case PP_EVENT_TYPE_MOUSEUP: + case PP_EVENT_TYPE_MOUSEMOVE: + case PP_EVENT_TYPE_MOUSEENTER: + case PP_EVENT_TYPE_MOUSELEAVE: //client_->handle_mouse_event(npevent); break; - case PP_Event_Type_Char: + case PP_EVENT_TYPE_CHAR: //client_->handle_char_event(npevent); break; diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc index c8a0895..ad21956 100644 --- a/remoting/client/plugin/pepper_entrypoints.cc +++ b/remoting/client/plugin/pepper_entrypoints.cc @@ -174,7 +174,7 @@ class ChromotingModule { static PP_Var Instance_GetInstanceObject(PP_Instance pp_instance) { PP_Var var; - var.type = PP_VarType_Void; + var.type = PP_VARTYPE_VOID; return var; } |