webkit/plugins/ppapi/ppb_flash_menu_impl.h - Issue 9015009: Use the new callback tracker and delete the old one

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/plugins/ppapi/ppb_flash_menu_impl.h

Issue 9015009: Use the new callback tracker and delete the old one (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add IsPending Created 8 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/plugins/ppapi/ppb_flash_menu_impl.h

diff --git a/webkit/plugins/ppapi/ppb_flash_menu_impl.h b/webkit/plugins/ppapi/ppb_flash_menu_impl.h

index 5f454f90b3b37952e4485da1c74ef405da9f85ac..92daa646019c623e09097d33581d4f0561e23695 100644

--- a/webkit/plugins/ppapi/ppb_flash_menu_impl.h

+++ b/webkit/plugins/ppapi/ppb_flash_menu_impl.h

@@ -12,9 +12,9 @@

#include "base/memory/ref_counted.h"

#include "ppapi/c/pp_point.h"

#include "ppapi/c/private/ppb_flash_menu.h"

+#include "ppapi/shared_impl/tracked_callback.h"

#include "ppapi/shared_impl/resource.h"

#include "ppapi/thunk/ppb_flash_menu_api.h"

-#include "webkit/plugins/ppapi/callbacks.h"

#include "webkit/plugins/webkit_plugins_export.h"

struct WebMenuItem;

@@ -57,7 +57,7 @@ class PPB_Flash_Menu_Impl : public ::ppapi::Resource,

std::vector<int32_t> menu_id_map_;

// Any pending callback (for |Show()|).

- scoped_refptr<TrackedCompletionCallback> callback_;

+ scoped_refptr< ::ppapi::TrackedCallback> callback_;

// Output buffers to be filled in when the callback is completed successfully.

int32_t* selected_id_out_;