| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "webkit/glue/context_menu.h" | 5 #include "webkit/glue/context_menu.h" | 
| 6 #include "webkit/glue/glue_serialize.h" | 6 #include "webkit/glue/glue_serialize.h" | 
| 7 | 7 | 
|  | 8 // TODO(jam): remove me once WebKit is merged. | 
|  | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpellCheckClient.h
    " | 
|  | 10 | 
| 8 namespace webkit_glue { | 11 namespace webkit_glue { | 
| 9 | 12 | 
| 10 CustomContextMenuContext::CustomContextMenuContext() | 13 CustomContextMenuContext::CustomContextMenuContext() | 
| 11     : is_pepper_menu(false), | 14     : is_pepper_menu(false), | 
| 12       request_id(0) { | 15       request_id(0) { | 
| 13 } | 16 } | 
| 14 | 17 | 
| 15 }  // namespace webkit_glue | 18 }  // namespace webkit_glue | 
| 16 | 19 | 
| 17 ContextMenuParams::ContextMenuParams() { | 20 ContextMenuParams::ContextMenuParams() { | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 33       spellcheck_enabled(data.isSpellCheckingEnabled), | 36       spellcheck_enabled(data.isSpellCheckingEnabled), | 
| 34       is_editable(data.isEditable), | 37       is_editable(data.isEditable), | 
| 35 #if defined(OS_MACOSX) | 38 #if defined(OS_MACOSX) | 
| 36       writing_direction_default(data.writingDirectionDefault), | 39       writing_direction_default(data.writingDirectionDefault), | 
| 37       writing_direction_left_to_right(data.writingDirectionLeftToRight), | 40       writing_direction_left_to_right(data.writingDirectionLeftToRight), | 
| 38       writing_direction_right_to_left(data.writingDirectionRightToLeft), | 41       writing_direction_right_to_left(data.writingDirectionRightToLeft), | 
| 39 #endif  // OS_MACOSX | 42 #endif  // OS_MACOSX | 
| 40       edit_flags(data.editFlags), | 43       edit_flags(data.editFlags), | 
| 41       security_info(data.securityInfo), | 44       security_info(data.securityInfo), | 
| 42       frame_charset(data.frameEncoding.utf8()) { | 45       frame_charset(data.frameEncoding.utf8()) { | 
|  | 46 #if defined(WEBSPELLCHECKCLIENT_HAS_SUGGESTIONS) | 
|  | 47   for (size_t i = 0; i < data.dictionarySuggestions.size(); ++i) | 
|  | 48     dictionary_suggestions.push_back(data.dictionarySuggestions[i]); | 
|  | 49 #endif | 
|  | 50 | 
| 43   custom_context.is_pepper_menu = false; | 51   custom_context.is_pepper_menu = false; | 
| 44   for (size_t i = 0; i < data.customItems.size(); ++i) | 52   for (size_t i = 0; i < data.customItems.size(); ++i) | 
| 45     custom_items.push_back(WebMenuItem(data.customItems[i])); | 53     custom_items.push_back(WebMenuItem(data.customItems[i])); | 
| 46 | 54 | 
| 47   if (!data.frameHistoryItem.isNull()) { | 55   if (!data.frameHistoryItem.isNull()) { | 
| 48     frame_content_state = | 56     frame_content_state = | 
| 49         webkit_glue::HistoryItemToString(data.frameHistoryItem); | 57         webkit_glue::HistoryItemToString(data.frameHistoryItem); | 
| 50   } | 58   } | 
| 51 } | 59 } | 
| 52 | 60 | 
| 53 ContextMenuParams::~ContextMenuParams() { | 61 ContextMenuParams::~ContextMenuParams() { | 
| 54 } | 62 } | 
| OLD | NEW | 
|---|