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

Side by Side Diff: content/public/common/context_menu_params.h

Issue 17432002: Replace content::ContextMenuSourceType with ui::MenuSourceType. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_
6 #define CONTENT_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_ 6 #define CONTENT_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/public/common/context_menu_source_type.h"
14 #include "content/public/common/page_state.h" 13 #include "content/public/common/page_state.h"
15 #include "content/public/common/ssl_status.h" 14 #include "content/public/common/ssl_status.h"
16 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
17 #include "third_party/WebKit/public/web/WebContextMenuData.h" 16 #include "third_party/WebKit/public/web/WebContextMenuData.h"
18 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" 17 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
18 #include "ui/base/ui_base_types.h"
19 #include "webkit/common/webmenuitem.h" 19 #include "webkit/common/webmenuitem.h"
20 20
21 #if defined(OS_ANDROID) 21 #if defined(OS_ANDROID)
22 #include "ui/gfx/point.h" 22 #include "ui/gfx/point.h"
23 #endif 23 #endif
24 24
25 namespace content { 25 namespace content {
26 26
27 struct CONTENT_EXPORT CustomContextMenuContext { 27 struct CONTENT_EXPORT CustomContextMenuContext {
28 static const int32 kCurrentRenderWidget; 28 static const int32 kCurrentRenderWidget;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 // The character encoding of the frame on which the menu is invoked. 140 // The character encoding of the frame on which the menu is invoked.
141 std::string frame_charset; 141 std::string frame_charset;
142 142
143 // The referrer policy of the frame on which the menu is invoked. 143 // The referrer policy of the frame on which the menu is invoked.
144 WebKit::WebReferrerPolicy referrer_policy; 144 WebKit::WebReferrerPolicy referrer_policy;
145 145
146 CustomContextMenuContext custom_context; 146 CustomContextMenuContext custom_context;
147 std::vector<WebMenuItem> custom_items; 147 std::vector<WebMenuItem> custom_items;
148 148
149 ContextMenuSourceType source_type; 149 ui::MenuSourceType source_type;
150 150
151 #if defined(OS_ANDROID) 151 #if defined(OS_ANDROID)
152 // Points representing the coordinates in the document space of the start and 152 // Points representing the coordinates in the document space of the start and
153 // end of the selection, if there is one. 153 // end of the selection, if there is one.
154 gfx::Point selection_start; 154 gfx::Point selection_start;
155 gfx::Point selection_end; 155 gfx::Point selection_end;
156 #endif 156 #endif
157 157
158 }; 158 };
159 159
160 } // namespace content 160 } // namespace content
161 161
162 #endif // CONTENT_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_ 162 #endif // CONTENT_PUBLIC_COMMON_CONTEXT_MENU_PARAMS_H_
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_view_delegate.h ('k') | content/public/common/context_menu_source_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698