diff options
| author | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 22:38:38 +0000 |
|---|---|---|
| committer | noelallen@chromium.org <noelallen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 22:38:38 +0000 |
| commit | 56721c912f3725ab3b7fb341809991ce41dafab5 (patch) | |
| tree | 3321d78751834680f0f76d35bedb62983ff0ad5a /native_client_sdk/src | |
| parent | b14822c2ddc4a665a64ee1922f7e68bf66a900b4 (diff) | |
| download | chromium_src-56721c912f3725ab3b7fb341809991ce41dafab5.zip chromium_src-56721c912f3725ab3b7fb341809991ce41dafab5.tar.gz chromium_src-56721c912f3725ab3b7fb341809991ce41dafab5.tar.bz2 | |
Fix NewRequiredCallback use in examples
Replace NewRequiredCallback with NewCallback in C++ examples for the SDK.
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/9705069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src')
| -rw-r--r-- | native_client_sdk/src/examples/geturl/geturl_handler.cc | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/examples/index.html | 2 | ||||
| -rw-r--r-- | native_client_sdk/src/examples/mouselock/mouselock.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/native_client_sdk/src/examples/geturl/geturl_handler.cc b/native_client_sdk/src/examples/geturl/geturl_handler.cc index 2c944bb..8b758cf 100644 --- a/native_client_sdk/src/examples/geturl/geturl_handler.cc +++ b/native_client_sdk/src/examples/geturl/geturl_handler.cc @@ -42,7 +42,7 @@ GetURLHandler::~GetURLHandler() { void GetURLHandler::Start() { pp::CompletionCallback cc = - cc_factory_.NewRequiredCallback(&GetURLHandler::OnOpen); + cc_factory_.NewCallback(&GetURLHandler::OnOpen); url_loader_.Open(url_request_, cc); } diff --git a/native_client_sdk/src/examples/index.html b/native_client_sdk/src/examples/index.html index 0f20761..470d903 100644 --- a/native_client_sdk/src/examples/index.html +++ b/native_client_sdk/src/examples/index.html @@ -160,7 +160,7 @@ mulithreading...</p></dd> full-screen display by pressing the Enter key. <p>Teaching focus: Full-screen</p> </dd> - <dt><a href="mouselock/mouselock.html">Mouse Locker</a></dt> + <dt><a href="mouselock/mouselock.html">Mouse Lock</a></dt> <dd> The Mouselock example demonstrates how to use the MouseLock API to hide the mouse cursor. Mouse lock is only available in full-screen mode. You can lock and unlock the mouse while in full-screen mode by pressing the Enter key. diff --git a/native_client_sdk/src/examples/mouselock/mouselock.cc b/native_client_sdk/src/examples/mouselock/mouselock.cc index f020da9..3d4db51 100644 --- a/native_client_sdk/src/examples/mouselock/mouselock.cc +++ b/native_client_sdk/src/examples/mouselock/mouselock.cc @@ -63,7 +63,7 @@ bool MouseLockInstance::HandleInputEvent(const pp::InputEvent& event) { pp::MouseInputEvent mouse_event(event); if (mouse_event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT && !mouse_locked_) { - LockMouse(callback_factory_.NewRequiredCallback( + LockMouse(callback_factory_.NewCallback( &MouseLockInstance::DidLockMouse)); } } @@ -85,7 +85,7 @@ bool MouseLockInstance::HandleInputEvent(const pp::InputEvent& event) { if (mouse_locked_) { UnlockMouse(); } else { - LockMouse(callback_factory_.NewRequiredCallback( + LockMouse(callback_factory_.NewCallback( &MouseLockInstance::DidLockMouse)); } } @@ -173,7 +173,7 @@ void MouseLockInstance::Paint() { device_context_.ReplaceContents(&image); waiting_for_flush_completion_ = true; device_context_.Flush( - callback_factory_.NewRequiredCallback(&MouseLockInstance::DidFlush)); + callback_factory_.NewCallback(&MouseLockInstance::DidFlush)); } pp::ImageData MouseLockInstance::PaintImage(int width, int height) { |