extensions/utility/unpacker.cc - Issue 1755363003: Revert of Mustash: Move GURL ParamTraits to url/ipc

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: extensions/utility/unpacker.cc

Issue 1755363003: Revert of Mustash: Move GURL ParamTraits to url/ipc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months 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 unified diff | Download patch

« no previous file with comments | « extensions/extensions.gyp ('k') | url/BUILD.gn » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "extensions/utility/unpacker.h"	5 #include "extensions/utility/unpacker.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include <set>	9 #include <set>

10 #include <utility>	10 #include <utility>

11	11

12 #include "base/files/file_enumerator.h"	12 #include "base/files/file_enumerator.h"

13 #include "base/files/file_util.h"	13 #include "base/files/file_util.h"

14 #include "base/files/scoped_temp_dir.h"	14 #include "base/files/scoped_temp_dir.h"

15 #include "base/i18n/rtl.h"	15 #include "base/i18n/rtl.h"

16 #include "base/json/json_file_value_serializer.h"	16 #include "base/json/json_file_value_serializer.h"

17 #include "base/numerics/safe_conversions.h"	17 #include "base/numerics/safe_conversions.h"

18 #include "base/strings/string_util.h"	18 #include "base/strings/string_util.h"

19 #include "base/strings/utf_string_conversions.h"	19 #include "base/strings/utf_string_conversions.h"

20 #include "base/threading/thread.h"	20 #include "base/threading/thread.h"

21 #include "base/values.h"	21 #include "base/values.h"

22 #include "content/public/child/image_decoder_utils.h"	22 #include "content/public/child/image_decoder_utils.h"

	23 #include "content/public/common/common_param_traits.h"

23 #include "extensions/common/constants.h"	24 #include "extensions/common/constants.h"

24 #include "extensions/common/extension.h"	25 #include "extensions/common/extension.h"

25 #include "extensions/common/extension_l10n_util.h"	26 #include "extensions/common/extension_l10n_util.h"

26 #include "extensions/common/extension_utility_messages.h"	27 #include "extensions/common/extension_utility_messages.h"

27 #include "extensions/common/extensions_client.h"	28 #include "extensions/common/extensions_client.h"

28 #include "extensions/common/file_util.h"	29 #include "extensions/common/file_util.h"

29 #include "extensions/common/manifest.h"	30 #include "extensions/common/manifest.h"

30 #include "extensions/common/manifest_constants.h"	31 #include "extensions/common/manifest_constants.h"

31 #include "extensions/common/manifest_handlers/default_locale_handler.h"	32 #include "extensions/common/manifest_handlers/default_locale_handler.h"

32 #include "extensions/strings/grit/extensions_strings.h"	33 #include "extensions/strings/grit/extensions_strings.h"

(...skipping 255 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
288	289

289 void Unpacker::SetError(const std::string& error) {	290 void Unpacker::SetError(const std::string& error) {

290 SetUTF16Error(base::UTF8ToUTF16(error));	291 SetUTF16Error(base::UTF8ToUTF16(error));

291 }	292 }

292	293

293 void Unpacker::SetUTF16Error(const base::string16& error) {	294 void Unpacker::SetUTF16Error(const base::string16& error) {

294 error_message_ = error;	295 error_message_ = error;

295 }	296 }

296	297

297 } // namespace extensions	298 } // namespace extensions

OLD	NEW