Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: content/browser/web_contents/web_contents_view_android.h

Issue 197533008: Mac: ExternalPopupMenu::close should hide a showing popup menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 6 years, 9 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/port/browser/render_view_host_delegate_view.h" 10 #include "content/port/browser/render_view_host_delegate_view.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // Backend implementation of RenderViewHostDelegateView. 59 // Backend implementation of RenderViewHostDelegateView.
60 virtual void ShowContextMenu(RenderFrameHost* render_frame_host, 60 virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
61 const ContextMenuParams& params) OVERRIDE; 61 const ContextMenuParams& params) OVERRIDE;
62 virtual void ShowPopupMenu(const gfx::Rect& bounds, 62 virtual void ShowPopupMenu(const gfx::Rect& bounds,
63 int item_height, 63 int item_height,
64 double item_font_size, 64 double item_font_size,
65 int selected_item, 65 int selected_item,
66 const std::vector<MenuItem>& items, 66 const std::vector<MenuItem>& items,
67 bool right_aligned, 67 bool right_aligned,
68 bool allow_multiple_selection) OVERRIDE; 68 bool allow_multiple_selection) OVERRIDE;
69 virtual void HidePopupMenu() OVERRIDE;
69 virtual void StartDragging(const DropData& drop_data, 70 virtual void StartDragging(const DropData& drop_data,
70 blink::WebDragOperationsMask allowed_ops, 71 blink::WebDragOperationsMask allowed_ops,
71 const gfx::ImageSkia& image, 72 const gfx::ImageSkia& image,
72 const gfx::Vector2d& image_offset, 73 const gfx::Vector2d& image_offset,
73 const DragEventSourceInfo& event_info) OVERRIDE; 74 const DragEventSourceInfo& event_info) OVERRIDE;
74 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 75 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
75 virtual void GotFocus() OVERRIDE; 76 virtual void GotFocus() OVERRIDE;
76 virtual void TakeFocus(bool reverse) OVERRIDE; 77 virtual void TakeFocus(bool reverse) OVERRIDE;
77 78
78 private: 79 private:
79 // The WebContents whose contents we display. 80 // The WebContents whose contents we display.
80 WebContentsImpl* web_contents_; 81 WebContentsImpl* web_contents_;
81 82
82 // ContentViewCoreImpl is our interface to the view system. 83 // ContentViewCoreImpl is our interface to the view system.
83 ContentViewCoreImpl* content_view_core_; 84 ContentViewCoreImpl* content_view_core_;
84 85
85 // Interface for extensions to WebContentsView. Used to show the context menu. 86 // Interface for extensions to WebContentsView. Used to show the context menu.
86 scoped_ptr<WebContentsViewDelegate> delegate_; 87 scoped_ptr<WebContentsViewDelegate> delegate_;
87 88
88 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 89 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
89 }; 90 };
90 91
91 } // namespace content 92 } // namespace content
92 93
93 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 94 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/webmenurunner_mac.mm ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698