diff options
Diffstat (limited to 'chrome/browser/extensions')
4 files changed, 46 insertions, 47 deletions
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc index 6261a4b..95d3acb 100644 --- a/chrome/browser/extensions/extension_history_api.cc +++ b/chrome/browser/extensions/extension_history_api.cc @@ -248,8 +248,7 @@ bool SearchHistoryFunction::RunAsyncImpl() { // Initialize the HistoryQuery string16 search_text; - EXTENSION_FUNCTION_VALIDATE(json->GetStringAsUTF16(keys::kTextKey, - &search_text)); + EXTENSION_FUNCTION_VALIDATE(json->GetString(keys::kTextKey, &search_text)); history::QueryOptions options; options.SetRecentDayRange(1); diff --git a/chrome/browser/extensions/extension_history_api_constants.cc b/chrome/browser/extensions/extension_history_api_constants.cc index 927f76e..b04b7eb 100644 --- a/chrome/browser/extensions/extension_history_api_constants.cc +++ b/chrome/browser/extensions/extension_history_api_constants.cc @@ -6,25 +6,25 @@ namespace extension_history_api_constants { -const wchar_t kAllHistoryKey[] = L"allHistory"; -const wchar_t kEndTimeKey[] = L"endTime"; -const wchar_t kFavIconUrlKey[] = L"favIconUrl"; -const wchar_t kIdKey[] = L"id"; -const wchar_t kLastVisitdKey[] = L"lastVisitTime"; -const wchar_t kMaxResultsKey[] = L"maxResults"; -const wchar_t kNewKey[] = L"new"; -const wchar_t kReferringVisitId[] = L"referringVisitId"; -const wchar_t kRemovedKey[] = L"removed"; -const wchar_t kStartTimeKey[] = L"startTime"; -const wchar_t kTextKey[] = L"text"; -const wchar_t kTitleKey[] = L"title"; -const wchar_t kTypedCountKey[] = L"typedCount"; -const wchar_t kVisitCountKey[] = L"visitCount"; -const wchar_t kTransition[] = L"transition"; -const wchar_t kUrlKey[] = L"url"; -const wchar_t kUrlsKey[] = L"urls"; -const wchar_t kVisitId[] = L"visitId"; -const wchar_t kVisitTime[] = L"visitTime"; +const char kAllHistoryKey[] = "allHistory"; +const char kEndTimeKey[] = "endTime"; +const char kFavIconUrlKey[] = "favIconUrl"; +const char kIdKey[] = "id"; +const char kLastVisitdKey[] = "lastVisitTime"; +const char kMaxResultsKey[] = "maxResults"; +const char kNewKey[] = "new"; +const char kReferringVisitId[] = "referringVisitId"; +const char kRemovedKey[] = "removed"; +const char kStartTimeKey[] = "startTime"; +const char kTextKey[] = "text"; +const char kTitleKey[] = "title"; +const char kTypedCountKey[] = "typedCount"; +const char kVisitCountKey[] = "visitCount"; +const char kTransition[] = "transition"; +const char kUrlKey[] = "url"; +const char kUrlsKey[] = "urls"; +const char kVisitId[] = "visitId"; +const char kVisitTime[] = "visitTime"; const char kOnVisited[] = "history.onVisited"; const char kOnVisitRemoved[] = "history.onVisitRemoved"; diff --git a/chrome/browser/extensions/extension_history_api_constants.h b/chrome/browser/extensions/extension_history_api_constants.h index 442b7e7..6417b9e 100644 --- a/chrome/browser/extensions/extension_history_api_constants.h +++ b/chrome/browser/extensions/extension_history_api_constants.h @@ -11,25 +11,25 @@ namespace extension_history_api_constants { // Keys. -extern const wchar_t kAllHistoryKey[]; -extern const wchar_t kEndTimeKey[]; -extern const wchar_t kFavIconUrlKey[]; -extern const wchar_t kIdKey[]; -extern const wchar_t kLastVisitdKey[]; -extern const wchar_t kMaxResultsKey[]; -extern const wchar_t kNewKey[]; -extern const wchar_t kReferringVisitId[]; -extern const wchar_t kRemovedKey[]; -extern const wchar_t kStartTimeKey[]; -extern const wchar_t kTextKey[]; -extern const wchar_t kTitleKey[]; -extern const wchar_t kTypedCountKey[]; -extern const wchar_t kVisitCountKey[]; -extern const wchar_t kTransition[]; -extern const wchar_t kUrlKey[]; -extern const wchar_t kUrlsKey[]; -extern const wchar_t kVisitId[]; -extern const wchar_t kVisitTime[]; +extern const char kAllHistoryKey[]; +extern const char kEndTimeKey[]; +extern const char kFavIconUrlKey[]; +extern const char kIdKey[]; +extern const char kLastVisitdKey[]; +extern const char kMaxResultsKey[]; +extern const char kNewKey[]; +extern const char kReferringVisitId[]; +extern const char kRemovedKey[]; +extern const char kStartTimeKey[]; +extern const char kTextKey[]; +extern const char kTitleKey[]; +extern const char kTypedCountKey[]; +extern const char kVisitCountKey[]; +extern const char kTransition[]; +extern const char kUrlKey[]; +extern const char kUrlsKey[]; +extern const char kVisitId[]; +extern const char kVisitTime[]; // Events. extern const char kOnVisited[]; diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc index c4845a6..89ed86c 100644 --- a/chrome/browser/extensions/extension_omnibox_api.cc +++ b/chrome/browser/extensions/extension_omnibox_api.cc @@ -25,11 +25,11 @@ const char kDescriptionStylesLengthError[] = "Suggestion descriptionStyles contains an offset longer than the" " description text"; -const wchar_t kSuggestionContent[] = L"content"; -const wchar_t kSuggestionDescription[] = L"description"; -const wchar_t kSuggestionDescriptionStyles[] = L"descriptionStyles"; -const wchar_t kDescriptionStylesType[] = L"type"; -const wchar_t kDescriptionStylesOffset[] = L"offset"; +const char kSuggestionContent[] = "content"; +const char kSuggestionDescription[] = "description"; +const char kSuggestionDescriptionStyles[] = "descriptionStyles"; +const char kDescriptionStylesType[] = "type"; +const char kDescriptionStylesOffset[] = "offset"; }; // namespace // static @@ -101,9 +101,9 @@ bool OmniboxSendSuggestionsFunction::RunImpl() { DictionaryValue* suggestion_value; EXTENSION_FUNCTION_VALIDATE(suggestions_value->GetDictionary( i, &suggestion_value)); - EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetStringAsUTF16( + EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetString( kSuggestionContent, &suggestion.content)); - EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetStringAsUTF16( + EXTENSION_FUNCTION_VALIDATE(suggestion_value->GetString( kSuggestionDescription, &suggestion.description)); if (suggestion_value->HasKey(kSuggestionDescriptionStyles)) { |