| Index: chrome/renderer/render_view.h
|
| diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
|
| index 92a3577f909f5f2fd29e321d360784b3eb25139c..1224dc66c85551db465940645960c105e4d24065 100644
|
| --- a/chrome/renderer/render_view.h
|
| +++ b/chrome/renderer/render_view.h
|
| @@ -114,6 +114,7 @@ class PhishingClassifierDelegate;
|
| }
|
|
|
| namespace webkit_glue {
|
| +struct CustomContextMenuContext;
|
| class ImageResourceFetcher;
|
| struct FileUploadData;
|
| struct FormData;
|
| @@ -826,7 +827,8 @@ class RenderView : public RenderWidget,
|
| const PP_Flash_NetAddress& local_addr,
|
| const PP_Flash_NetAddress& remote_addr);
|
| #endif
|
| - void OnContextMenuClosed();
|
| + void OnContextMenuClosed(
|
| + const webkit_glue::CustomContextMenuContext& custom_context);
|
| void OnCopy();
|
| void OnCopyImageAt(int x, int y);
|
| #if defined(OS_MACOSX)
|
| @@ -838,7 +840,9 @@ class RenderView : public RenderWidget,
|
| void OnCSSInsertRequest(const std::wstring& frame_xpath,
|
| const std::string& css,
|
| const std::string& id);
|
| - void OnCustomContextMenuAction(unsigned action);
|
| + void OnCustomContextMenuAction(
|
| + const webkit_glue::CustomContextMenuContext& custom_context,
|
| + unsigned action);
|
| void OnDelete();
|
| void OnDeterminePageLanguage();
|
| void OnDisableScrollbarsForSmallWindows(
|
| @@ -940,6 +944,9 @@ class RenderView : public RenderWidget,
|
| void OnShouldClose();
|
| void OnStop();
|
| void OnStopFinding(const ViewMsg_StopFinding_Params& params);
|
| + void OnShowCustomContextMenuACK(int request_id,
|
| + bool did_select,
|
| + int32_t selected_id);
|
| void OnThemeChanged();
|
| void OnToggleSpellCheck();
|
| void OnToggleSpellPanel(bool is_currently_visible);
|
| @@ -1470,6 +1477,11 @@ class RenderView : public RenderWidget,
|
| // The node that the context menu was pressed over.
|
| WebKit::WebNode context_menu_node_;
|
|
|
| + // Used to send a single context menu "completion" for Pepper context menus
|
| + // upon menu close.
|
| + bool has_saved_context_menu_action_;
|
| + unsigned saved_context_menu_action_;
|
| +
|
| // Reports load progress to the browser.
|
| scoped_ptr<LoadProgressTracker> load_progress_tracker_;
|
|
|
|
|