diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 16:36:02 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 16:36:02 +0000 |
commit | d153c80959407a591a08a9deb1878295176fcb04 (patch) | |
tree | b1ff32af2d2b7e4cc46e84d69bd39f6d65705807 /ppapi/examples/file_chooser | |
parent | 88a14fa437caa6df64fece3df39c8ec8bde31f84 (diff) | |
download | chromium_src-d153c80959407a591a08a9deb1878295176fcb04.zip chromium_src-d153c80959407a591a08a9deb1878295176fcb04.tar.gz chromium_src-d153c80959407a591a08a9deb1878295176fcb04.tar.bz2 |
Revert 93202 - Remove HandleInputEvent from PPP_Instance and freeze to 1.0.
Note I'm leaving in temporary backwards-compatibility.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2035
TEST=ppapi tests
Review URL: http://codereview.chromium.org/7452002
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/7467002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/examples/file_chooser')
-rw-r--r-- | ppapi/examples/file_chooser/file_chooser.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ppapi/examples/file_chooser/file_chooser.cc b/ppapi/examples/file_chooser/file_chooser.cc index e1eb6bd..598095f 100644 --- a/ppapi/examples/file_chooser/file_chooser.cc +++ b/ppapi/examples/file_chooser/file_chooser.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,7 +7,6 @@ #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/file_chooser_dev.h" #include "ppapi/cpp/file_ref.h" -#include "ppapi/cpp/input_event.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/private/instance_private.h" #include "ppapi/cpp/private/var_private.h" @@ -17,17 +16,15 @@ class MyInstance : public pp::InstancePrivate { MyInstance(PP_Instance instance) : pp::InstancePrivate(instance) { callback_factory_.Initialize(this); - RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE); } - virtual bool HandleInputEvent(const pp::InputEvent& event) { - switch (event.GetType()) { + virtual bool HandleInputEvent(const PP_InputEvent& event) { + switch (event.type) { case PP_INPUTEVENT_TYPE_MOUSEDOWN: { - pp::MouseInputEvent mouse_event(event); - if (mouse_event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) + const PP_InputEvent_Mouse& mouse_event = event.u.mouse; + if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_LEFT) ShowFileChooser(false); - else if (mouse_event.GetMouseButton() - == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) + else if (mouse_event.button == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) ShowFileChooser(true); else return false; |