diff options
6 files changed, 63 insertions, 63 deletions
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc index b4b9d52..4008ffb 100644 --- a/chrome/browser/extensions/execute_code_in_tab_function.cc +++ b/chrome/browser/extensions/execute_code_in_tab_function.cc @@ -114,6 +114,8 @@ void ExecuteCodeInTabFunction::DidLoadFile(bool success, Execute(data); } else { #if defined(OS_POSIX) + // TODO(viettrungluu): bug: there's no particular reason the path should be + // UTF-8, in which case this may fail. error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError, resource_.relative_path().value()); #elif defined(OS_WIN) diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index e2c30c4..37bc42d 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -41,7 +41,6 @@ #include "chrome/browser/extensions/extension_proxy_api.h" #include "chrome/browser/extensions/extension_rlz_module.h" #include "chrome/browser/extensions/extension_tabs_module.h" -#include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/extensions/extension_test_api.h" #if defined(OS_CHROMEOS) #include "chrome/browser/extensions/extension_tts_api.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 895fd2f..5dd126e 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -21,7 +21,6 @@ #include "chrome/browser/dom_ui/dom_ui_factory.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_tabs_module.h" -#include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/in_process_webkit/dom_storage_context.h" #include "chrome/browser/in_process_webkit/webkit_context.h" diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 79b3cdf..b74d714 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -122,7 +122,7 @@ DictionaryValue* ExtensionTabUtil::CreateTabValue( result->SetString(keys::kStatusKey, GetTabStatusText(contents->is_loading())); result->SetBoolean(keys::kSelectedKey, tab_strip && tab_index == tab_strip->selected_index()); - result->SetString(keys::kTitleKey, UTF16ToWide(contents->GetTitle())); + result->SetString(keys::kTitleKey, contents->GetTitle()); result->SetBoolean(keys::kIncognitoKey, contents->profile()->IsOffTheRecord()); diff --git a/chrome/browser/extensions/extension_tabs_module_constants.cc b/chrome/browser/extensions/extension_tabs_module_constants.cc index e96793b..d1647f8 100644 --- a/chrome/browser/extensions/extension_tabs_module_constants.cc +++ b/chrome/browser/extensions/extension_tabs_module_constants.cc @@ -6,36 +6,36 @@ namespace extension_tabs_module_constants { -const wchar_t kAllFramesKey[] = L"allFrames"; -const wchar_t kCodeKey[] = L"code"; -const wchar_t kFavIconUrlKey[] = L"favIconUrl"; -const wchar_t kFileKey[] = L"file"; -const wchar_t kFocusedKey[] = L"focused"; -const wchar_t kFormatKey[] = L"format"; -const wchar_t kFromIndexKey[] = L"fromIndex"; -const wchar_t kHeightKey[] = L"height"; -const wchar_t kIdKey[] = L"id"; -const wchar_t kIncognitoKey[] = L"incognito"; -const wchar_t kIndexKey[] = L"index"; -const wchar_t kLeftKey[] = L"left"; -const wchar_t kNewPositionKey[] = L"newPosition"; -const wchar_t kNewWindowIdKey[] = L"newWindowId"; -const wchar_t kOldPositionKey[] = L"oldPosition"; -const wchar_t kOldWindowIdKey[] = L"oldWindowId"; -const wchar_t kPopulateKey[] = L"populate"; -const wchar_t kQualityKey[] = L"quality"; -const wchar_t kSelectedKey[] = L"selected"; -const wchar_t kStatusKey[] = L"status"; -const wchar_t kTabIdKey[] = L"tabId"; -const wchar_t kTabsKey[] = L"tabs"; -const wchar_t kTabUrlKey[] = L"tabUrl"; -const wchar_t kTitleKey[] = L"title"; -const wchar_t kToIndexKey[] = L"toIndex"; -const wchar_t kTopKey[] = L"top"; -const wchar_t kUrlKey[] = L"url"; -const wchar_t kWidthKey[] = L"width"; -const wchar_t kWindowIdKey[] = L"windowId"; -const wchar_t kWindowTypeKey[] = L"type"; +const char kAllFramesKey[] = "allFrames"; +const char kCodeKey[] = "code"; +const char kFavIconUrlKey[] = "favIconUrl"; +const char kFileKey[] = "file"; +const char kFocusedKey[] = "focused"; +const char kFormatKey[] = "format"; +const char kFromIndexKey[] = "fromIndex"; +const char kHeightKey[] = "height"; +const char kIdKey[] = "id"; +const char kIncognitoKey[] = "incognito"; +const char kIndexKey[] = "index"; +const char kLeftKey[] = "left"; +const char kNewPositionKey[] = "newPosition"; +const char kNewWindowIdKey[] = "newWindowId"; +const char kOldPositionKey[] = "oldPosition"; +const char kOldWindowIdKey[] = "oldWindowId"; +const char kPopulateKey[] = "populate"; +const char kQualityKey[] = "quality"; +const char kSelectedKey[] = "selected"; +const char kStatusKey[] = "status"; +const char kTabIdKey[] = "tabId"; +const char kTabsKey[] = "tabs"; +const char kTabUrlKey[] = "tabUrl"; +const char kTitleKey[] = "title"; +const char kToIndexKey[] = "toIndex"; +const char kTopKey[] = "top"; +const char kUrlKey[] = "url"; +const char kWidthKey[] = "width"; +const char kWindowIdKey[] = "windowId"; +const char kWindowTypeKey[] = "type"; const char kFormatValueJpeg[] = "jpeg"; const char kFormatValuePng[] = "png"; diff --git a/chrome/browser/extensions/extension_tabs_module_constants.h b/chrome/browser/extensions/extension_tabs_module_constants.h index 32abe925..3f0ddc0 100644 --- a/chrome/browser/extensions/extension_tabs_module_constants.h +++ b/chrome/browser/extensions/extension_tabs_module_constants.h @@ -11,36 +11,36 @@ namespace extension_tabs_module_constants { // Keys used in serializing tab data & events. -extern const wchar_t kAllFramesKey[]; -extern const wchar_t kCodeKey[]; -extern const wchar_t kFavIconUrlKey[]; -extern const wchar_t kFileKey[]; -extern const wchar_t kFocusedKey[]; -extern const wchar_t kFormatKey[]; -extern const wchar_t kFromIndexKey[]; -extern const wchar_t kHeightKey[]; -extern const wchar_t kIdKey[]; -extern const wchar_t kIndexKey[]; -extern const wchar_t kLeftKey[]; -extern const wchar_t kNewPositionKey[]; -extern const wchar_t kNewWindowIdKey[]; -extern const wchar_t kOldPositionKey[]; -extern const wchar_t kOldWindowIdKey[]; -extern const wchar_t kPopulateKey[]; -extern const wchar_t kQualityKey[]; -extern const wchar_t kSelectedKey[]; -extern const wchar_t kStatusKey[]; -extern const wchar_t kTabIdKey[]; -extern const wchar_t kTabsKey[]; -extern const wchar_t kTabUrlKey[]; -extern const wchar_t kTitleKey[]; -extern const wchar_t kToIndexKey[]; -extern const wchar_t kTopKey[]; -extern const wchar_t kUrlKey[]; -extern const wchar_t kWidthKey[]; -extern const wchar_t kWindowIdKey[]; -extern const wchar_t kIncognitoKey[]; -extern const wchar_t kWindowTypeKey[]; +extern const char kAllFramesKey[]; +extern const char kCodeKey[]; +extern const char kFavIconUrlKey[]; +extern const char kFileKey[]; +extern const char kFocusedKey[]; +extern const char kFormatKey[]; +extern const char kFromIndexKey[]; +extern const char kHeightKey[]; +extern const char kIdKey[]; +extern const char kIndexKey[]; +extern const char kLeftKey[]; +extern const char kNewPositionKey[]; +extern const char kNewWindowIdKey[]; +extern const char kOldPositionKey[]; +extern const char kOldWindowIdKey[]; +extern const char kPopulateKey[]; +extern const char kQualityKey[]; +extern const char kSelectedKey[]; +extern const char kStatusKey[]; +extern const char kTabIdKey[]; +extern const char kTabsKey[]; +extern const char kTabUrlKey[]; +extern const char kTitleKey[]; +extern const char kToIndexKey[]; +extern const char kTopKey[]; +extern const char kUrlKey[]; +extern const char kWidthKey[]; +extern const char kWindowIdKey[]; +extern const char kIncognitoKey[]; +extern const char kWindowTypeKey[]; // Value consts. extern const char kCanOnlyMoveTabsWithinNormalWindowsError[]; |