Index: content/renderer/context_menu_params_builder.cc |
diff --git a/content/public/common/context_menu_params.cc b/content/renderer/context_menu_params_builder.cc |
similarity index 52% |
copy from content/public/common/context_menu_params.cc |
copy to content/renderer/context_menu_params_builder.cc |
index 7a55b8918cc9f9ac8636efe286eec622fb23456e..3d3829bc88bf32db831c4f8549436ed93b229f6b 100644 |
--- a/content/public/common/context_menu_params.cc |
+++ b/content/renderer/context_menu_params_builder.cc |
@@ -1,68 +1,44 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2013 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/public/common/context_menu_params.h" |
+#include "content/renderer/context_menu_params_builder.h" |
#include "base/logging.h" |
#include "content/common/ssl_status_serialization.h" |
-#include "webkit/glue/glue_serialize.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h" |
+#include "webkit/glue/glue_serialize.h" |
namespace content { |
-const int32 CustomContextMenuContext::kCurrentRenderWidget = kint32max; |
- |
-CustomContextMenuContext::CustomContextMenuContext() |
- : is_pepper_menu(false), |
- request_id(0), |
- render_widget_id(kCurrentRenderWidget) { |
-} |
- |
-ContextMenuParams::ContextMenuParams() |
- : media_type(WebKit::WebContextMenuData::MediaTypeNone), |
- x(0), |
- y(0), |
- is_image_blocked(false), |
- frame_id(0), |
- media_flags(0), |
- speech_input_enabled(false), |
- spellcheck_enabled(false), |
- is_editable(false), |
- edit_flags(0), |
- referrer_policy(WebKit::WebReferrerPolicyDefault) { |
-} |
- |
-ContextMenuParams::~ContextMenuParams() { |
-} |
- |
-ContextMenuParams::ContextMenuParams(const WebKit::WebContextMenuData& data) |
- : media_type(data.mediaType), |
- x(data.mousePosition.x), |
- y(data.mousePosition.y), |
- link_url(data.linkURL), |
- unfiltered_link_url(data.linkURL), |
- src_url(data.srcURL), |
- is_image_blocked(data.isImageBlocked), |
- page_url(data.pageURL), |
- keyword_url(data.keywordURL), |
- frame_url(data.frameURL), |
- frame_id(0), |
- media_flags(data.mediaFlags), |
- selection_text(data.selectedText), |
- misspelled_word(data.misspelledWord), |
- speech_input_enabled(data.isSpeechInputEnabled), |
- spellcheck_enabled(data.isSpellCheckingEnabled), |
- is_editable(data.isEditable), |
+ContextMenuParamsBuilder::ContextMenuParamsBuilder( |
+ const WebKit::WebContextMenuData& data) { |
+ media_type = data.mediaType; |
+ x = data.mousePosition.x; |
+ y = data.mousePosition.y; |
+ link_url = data.linkURL; |
+ unfiltered_link_url = data.linkURL; |
+ src_url = data.srcURL; |
+ is_image_blocked = data.isImageBlocked; |
+ page_url = data.pageURL; |
+ keyword_url = data.keywordURL; |
+ frame_url = data.frameURL; |
+ media_flags = data.mediaFlags; |
+ selection_text = data.selectedText; |
+ misspelled_word = data.misspelledWord; |
+ speech_input_enabled = data.isSpeechInputEnabled; |
+ spellcheck_enabled = data.isSpellCheckingEnabled; |
+ is_editable = data.isEditable; |
#if defined(OS_MACOSX) |
- writing_direction_default(data.writingDirectionDefault), |
- writing_direction_left_to_right(data.writingDirectionLeftToRight), |
- writing_direction_right_to_left(data.writingDirectionRightToLeft), |
+ writing_direction_default = data.writingDirectionDefault; |
+ writing_direction_left_to_right = data.writingDirectionLeftToRight; |
+ writing_direction_right_to_left = data.writingDirectionRightToLeft; |
#endif // OS_MACOSX |
- edit_flags(data.editFlags), |
- frame_charset(data.frameEncoding.utf8()), |
- referrer_policy(data.referrerPolicy) { |
+ edit_flags = data.editFlags; |
+ frame_charset = data.frameEncoding.utf8(); |
+ referrer_policy = data.referrerPolicy; |
+ |
for (size_t i = 0; i < data.dictionarySuggestions.size(); ++i) |
dictionary_suggestions.push_back(data.dictionarySuggestions[i]); |