| Index: components/spellcheck/common/spellcheck_messages.h
|
| diff --git a/chrome/common/spellcheck_messages.h b/components/spellcheck/common/spellcheck_messages.h
|
| similarity index 86%
|
| rename from chrome/common/spellcheck_messages.h
|
| rename to components/spellcheck/common/spellcheck_messages.h
|
| index a8dac3998eba794b5a4806ee4890c5f0dd19db8a..6eab69929a6c2a97cbd206dd03d348c0dc9d21f7 100644
|
| --- a/chrome/common/spellcheck_messages.h
|
| +++ b/components/spellcheck/common/spellcheck_messages.h
|
| @@ -7,9 +7,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include "chrome/common/spellcheck_bdict_language.h"
|
| -#include "chrome/common/spellcheck_marker.h"
|
| -#include "chrome/common/spellcheck_result.h"
|
| +#include "components/spellcheck/common/spellcheck_bdict_language.h"
|
| +#include "components/spellcheck/common/spellcheck_marker.h"
|
| +#include "components/spellcheck/common/spellcheck_result.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_platform_file.h"
|
|
|
| @@ -19,9 +19,9 @@
|
|
|
| #define IPC_MESSAGE_START SpellCheckMsgStart
|
|
|
| -IPC_ENUM_TRAITS(SpellCheckResult::Decoration)
|
| +IPC_ENUM_TRAITS(spellcheck::SpellCheckResult::Decoration)
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(SpellCheckResult)
|
| +IPC_STRUCT_TRAITS_BEGIN(spellcheck::SpellCheckResult)
|
| IPC_STRUCT_TRAITS_MEMBER(decoration)
|
| IPC_STRUCT_TRAITS_MEMBER(location)
|
| IPC_STRUCT_TRAITS_MEMBER(length)
|
| @@ -29,12 +29,12 @@ IPC_STRUCT_TRAITS_BEGIN(SpellCheckResult)
|
| IPC_STRUCT_TRAITS_MEMBER(hash)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(SpellCheckMarker)
|
| +IPC_STRUCT_TRAITS_BEGIN(spellcheck::SpellCheckMarker)
|
| IPC_STRUCT_TRAITS_MEMBER(hash)
|
| IPC_STRUCT_TRAITS_MEMBER(offset)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(SpellCheckBDictLanguage)
|
| +IPC_STRUCT_TRAITS_BEGIN(spellcheck::SpellCheckBDictLanguage)
|
| IPC_STRUCT_TRAITS_MEMBER(file)
|
| IPC_STRUCT_TRAITS_MEMBER(language)
|
| IPC_STRUCT_TRAITS_END()
|
| @@ -47,9 +47,10 @@ IPC_MESSAGE_CONTROL1(SpellCheckMsg_EnableSpellCheck,
|
| // Passes some initialization params from the browser to the renderer's
|
| // spellchecker. This can be called directly after startup or in (async)
|
| // response to a RequestDictionary ViewHost message.
|
| -IPC_MESSAGE_CONTROL2(SpellCheckMsg_Init,
|
| - std::vector<SpellCheckBDictLanguage> /* bdict_languages */,
|
| - std::set<std::string> /* custom_dict_words */)
|
| +IPC_MESSAGE_CONTROL2(
|
| + SpellCheckMsg_Init,
|
| + std::vector<spellcheck::SpellCheckBDictLanguage> /* bdict_languages */,
|
| + std::set<std::string> /* custom_dict_words */)
|
|
|
| // Words have been added and removed in the custom dictionary; update the local
|
| // custom word list.
|
| @@ -75,7 +76,7 @@ IPC_MESSAGE_ROUTED4(SpellCheckMsg_RespondSpellingService,
|
| int /* request identifier given by WebKit */,
|
| bool /* succeeded calling service */,
|
| base::string16 /* sentence */,
|
| - std::vector<SpellCheckResult>)
|
| + std::vector<spellcheck::SpellCheckResult>)
|
| #endif
|
|
|
| #if defined(USE_BROWSER_SPELLCHECKER)
|
| @@ -88,7 +89,7 @@ IPC_MESSAGE_ROUTED0(SpellCheckMsg_AdvanceToNextMisspelling)
|
| IPC_MESSAGE_ROUTED3(SpellCheckMsg_RespondTextCheck,
|
| int /* request identifier given by WebKit */,
|
| base::string16 /* sentence */,
|
| - std::vector<SpellCheckResult>)
|
| + std::vector<spellcheck::SpellCheckResult>)
|
|
|
| IPC_MESSAGE_ROUTED1(SpellCheckMsg_ToggleSpellPanel,
|
| bool)
|
| @@ -114,7 +115,7 @@ IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_CallSpellingService,
|
| int /* route_id for response */,
|
| int /* request identifier given by WebKit */,
|
| base::string16 /* sentence */,
|
| - std::vector<SpellCheckMarker> /* markers */)
|
| + std::vector<spellcheck::SpellCheckMarker> /* markers */)
|
| #endif
|
|
|
| #if defined(USE_BROWSER_SPELLCHECKER)
|
| @@ -140,7 +141,7 @@ IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_RequestTextCheck,
|
| int /* route_id for response */,
|
| int /* request identifier given by WebKit */,
|
| base::string16 /* sentence */,
|
| - std::vector<SpellCheckMarker> /* markers */)
|
| + std::vector<spellcheck::SpellCheckMarker> /* markers */)
|
|
|
| IPC_MESSAGE_ROUTED2(SpellCheckHostMsg_ToggleSpellCheck,
|
| bool /* enabled */,
|
|
|