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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.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_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Overridden from RenderViewHostDelegateView: 130 // Overridden from RenderViewHostDelegateView:
131 virtual void ShowContextMenu(RenderFrameHost* render_frame_host, 131 virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
132 const ContextMenuParams& params) OVERRIDE; 132 const ContextMenuParams& params) OVERRIDE;
133 virtual void ShowPopupMenu(const gfx::Rect& bounds, 133 virtual void ShowPopupMenu(const gfx::Rect& bounds,
134 int item_height, 134 int item_height,
135 double item_font_size, 135 double item_font_size,
136 int selected_item, 136 int selected_item,
137 const std::vector<MenuItem>& items, 137 const std::vector<MenuItem>& items,
138 bool right_aligned, 138 bool right_aligned,
139 bool allow_multiple_selection) OVERRIDE; 139 bool allow_multiple_selection) OVERRIDE;
140 virtual void HidePopupMenu() OVERRIDE;
140 virtual void StartDragging(const DropData& drop_data, 141 virtual void StartDragging(const DropData& drop_data,
141 blink::WebDragOperationsMask operations, 142 blink::WebDragOperationsMask operations,
142 const gfx::ImageSkia& image, 143 const gfx::ImageSkia& image,
143 const gfx::Vector2d& image_offset, 144 const gfx::Vector2d& image_offset,
144 const DragEventSourceInfo& event_info) OVERRIDE; 145 const DragEventSourceInfo& event_info) OVERRIDE;
145 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE; 146 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
146 virtual void GotFocus() OVERRIDE; 147 virtual void GotFocus() OVERRIDE;
147 virtual void TakeFocus(bool reverse) OVERRIDE; 148 virtual void TakeFocus(bool reverse) OVERRIDE;
148 149
149 // Overridden from OverscrollControllerDelegate: 150 // Overridden from OverscrollControllerDelegate:
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 231
231 scoped_ptr<TouchEditableImplAura> touch_editable_; 232 scoped_ptr<TouchEditableImplAura> touch_editable_;
232 scoped_ptr<GestureNavSimple> gesture_nav_simple_; 233 scoped_ptr<GestureNavSimple> gesture_nav_simple_;
233 234
234 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 235 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
235 }; 236 };
236 237
237 } // namespace content 238 } // namespace content
238 239
239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 240 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698