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

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

Issue 2751763002: Make USE_EXTERNAL_POPUP_MENU local to content. (Closed)
Patch Set: rebase Created 3 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
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 <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "content/browser/loader/global_routing_id.h" 15 #include "content/browser/loader/global_routing_id.h"
16 #include "content/browser/renderer_host/overscroll_controller_delegate.h" 16 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
17 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 17 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
18 #include "content/browser/web_contents/web_contents_view.h" 18 #include "content/browser/web_contents/web_contents_view.h"
19 #include "content/common/content_export.h" 19 #include "content/common/content_export.h"
20 #include "content/common/features.h"
20 #include "ui/aura/client/drag_drop_delegate.h" 21 #include "ui/aura/client/drag_drop_delegate.h"
21 #include "ui/aura/window_delegate.h" 22 #include "ui/aura/window_delegate.h"
22 #include "ui/aura/window_observer.h" 23 #include "ui/aura/window_observer.h"
23 24
24 namespace aura { 25 namespace aura {
25 class Window; 26 class Window;
26 } 27 }
27 28
28 namespace ui { 29 namespace ui {
29 class DropTargetEvent; 30 class DropTargetEvent;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const ContextMenuParams& params) override; 131 const ContextMenuParams& params) override;
131 void StartDragging(const DropData& drop_data, 132 void StartDragging(const DropData& drop_data,
132 blink::WebDragOperationsMask operations, 133 blink::WebDragOperationsMask operations,
133 const gfx::ImageSkia& image, 134 const gfx::ImageSkia& image,
134 const gfx::Vector2d& image_offset, 135 const gfx::Vector2d& image_offset,
135 const DragEventSourceInfo& event_info, 136 const DragEventSourceInfo& event_info,
136 RenderWidgetHostImpl* source_rwh) override; 137 RenderWidgetHostImpl* source_rwh) override;
137 void UpdateDragCursor(blink::WebDragOperation operation) override; 138 void UpdateDragCursor(blink::WebDragOperation operation) override;
138 void GotFocus() override; 139 void GotFocus() override;
139 void TakeFocus(bool reverse) override; 140 void TakeFocus(bool reverse) override;
140 #if defined(USE_EXTERNAL_POPUP_MENU) 141 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
141 void ShowPopupMenu(RenderFrameHost* render_frame_host, 142 void ShowPopupMenu(RenderFrameHost* render_frame_host,
142 const gfx::Rect& bounds, 143 const gfx::Rect& bounds,
143 int item_height, 144 int item_height,
144 double item_font_size, 145 double item_font_size,
145 int selected_item, 146 int selected_item,
146 const std::vector<MenuItem>& items, 147 const std::vector<MenuItem>& items,
147 bool right_aligned, 148 bool right_aligned,
148 bool allow_multiple_selection) override; 149 bool allow_multiple_selection) override;
149 150
150 void HidePopupMenu() override; 151 void HidePopupMenu() override;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; 246 std::unique_ptr<GestureNavSimple> gesture_nav_simple_;
246 247
247 bool init_rwhv_with_null_parent_for_testing_; 248 bool init_rwhv_with_null_parent_for_testing_;
248 249
249 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 250 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
250 }; 251 };
251 252
252 } // namespace content 253 } // namespace content
253 254
254 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 255 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate_view.h ('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