chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc - Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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

« no previous file with comments | « chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc ('k') | chrome/common/extensions/manifest_handlers/theme_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

index 844c9818245b2e8760ed556e7503b4cd001bc4db..33d4731738b860ef7e77a93334621db0f680d4a3 100644

--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

@@ -246,7 +246,8 @@ bool SettingsOverridesHandler::Parse(Extension* extension,

info->startup_pages = ParseStartupPage(*settings, error);

if (!info->bookmarks_ui && !info->homepage &&

!info->search_engine && info->startup_pages.empty()) {

- *error = ASCIIToUTF16(manifest_errors::kInvalidEmptySettingsOverrides);

+ *error =

+ base::ASCIIToUTF16(manifest_errors::kInvalidEmptySettingsOverrides);

return false;

}

info->manifest_permission.reset(new ManifestPermissionImpl(