Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2432)

Unified Diff: chrome/common/extensions/extension.h

Issue 8890086: Issue 71980: Extensions code should use UTF-16 for user-visible Unicode strings (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h (revision 114019)
+++ chrome/common/extensions/extension.h (working copy)
@@ -205,7 +205,7 @@
Location location,
const base::DictionaryValue& value,
int flags,
- std::string* error);
+ std::string* std_error);
Aaron Boodman 2011/12/15 02:25:36 No need to change this. If it makes implementation
// In a few special circumstances, we want to create an Extension and give it
// an explicit id. Most consumers should just use the plain Create() method.
@@ -378,7 +378,7 @@
bool ParsePermissions(const extensions::Manifest* source,
const char* key,
int flags,
- std::string* error,
+ string16* error,
ExtensionAPIPermissionSet* api_permissions,
URLPatternSet* host_permissions);
@@ -619,7 +619,7 @@
// Initialize the extension from a parsed manifest.
// Takes ownership of the manifest |value|.
bool InitFromValue(extensions::Manifest* value, int flags,
- std::string* error);
+ string16* error);
// Helper function for implementing HasCachedImage/GetCachedImage. A return
// value of NULL means there is no matching image cached (we allow caching an
@@ -632,7 +632,7 @@
bool LoadUserScriptHelper(const base::DictionaryValue* content_script,
int definition_index,
int flags,
- std::string* error,
+ string16* error,
UserScript* result);
// Helper method that loads either the include_globs or exclude_globs list
@@ -640,7 +640,7 @@
bool LoadGlobsHelper(const base::DictionaryValue* content_script,
int content_script_index,
const char* globs_property_name,
- std::string* error,
+ string16* error,
void(UserScript::*add_method)(const std::string& glob),
UserScript *instance);
@@ -651,32 +651,32 @@
const char* list_error,
const char* value_error,
URLPattern::ParseOption parse_option,
- std::string* error);
+ string16* error);
bool LoadLaunchContainer(const extensions::Manifest* manifest,
- std::string* error);
+ string16* error);
bool LoadLaunchURL(const extensions::Manifest* manifest,
- std::string* error);
+ string16* error);
bool LoadAppIsolation(const extensions::Manifest* manifest,
- std::string* error);
+ string16* error);
bool LoadWebIntentServices(const extensions::Manifest* manifest,
- std::string* error);
+ string16* error);
// Helper method to load an ExtensionAction from the page_action or
// browser_action entries in the manifest.
ExtensionAction* LoadExtensionActionHelper(
- const base::DictionaryValue* extension_action, std::string* error);
+ const base::DictionaryValue* extension_action, string16* error);
// Helper method to load an FileBrowserHandlerList from the manifest.
FileBrowserHandlerList* LoadFileBrowserHandlers(
- const base::ListValue* extension_actions, std::string* error);
+ const base::ListValue* extension_actions, string16* error);
// Helper method to load an FileBrowserHandler from manifest.
FileBrowserHandler* LoadFileBrowserHandler(
- const base::DictionaryValue* file_browser_handlers, std::string* error);
+ const base::DictionaryValue* file_browser_handlers, string16* error);
// Helper method to load an ExtensionSidebarDefaults from the sidebar manifest
// entry.
ExtensionSidebarDefaults* LoadExtensionSidebarDefaults(
- const base::DictionaryValue* sidebar, std::string* error);
+ const base::DictionaryValue* sidebar, string16* error);
// Returns true if the extension has more than one "UI surface". For example,
// an extension that has a browser action and a page action.
@@ -688,7 +688,7 @@
// Returns true if this extension can specify |api|.
bool CanSpecifyAPIPermission(const ExtensionAPIPermission* api,
- std::string* error) const;
+ string16* error) const;
bool CanSpecifyComponentOnlyPermission() const;
bool CanSpecifyExperimentalPermission() const;

Powered by Google App Engine
This is Rietveld 408576698