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

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

Issue 1824993004: Separate gfx_ipc into skia-dependent and non-skia-dependent parts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add includes associated with new skia-only ui/gfx/ipc target Created 4 years, 8 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
OLDNEW
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 <tuple> 10 #include <tuple>
(...skipping 18 matching lines...) Expand all
29 #include "extensions/common/file_util.h" 29 #include "extensions/common/file_util.h"
30 #include "extensions/common/manifest.h" 30 #include "extensions/common/manifest.h"
31 #include "extensions/common/manifest_constants.h" 31 #include "extensions/common/manifest_constants.h"
32 #include "extensions/common/manifest_handlers/default_locale_handler.h" 32 #include "extensions/common/manifest_handlers/default_locale_handler.h"
33 #include "extensions/strings/grit/extensions_strings.h" 33 #include "extensions/strings/grit/extensions_strings.h"
34 #include "ipc/ipc_message_utils.h" 34 #include "ipc/ipc_message_utils.h"
35 #include "net/base/file_stream.h" 35 #include "net/base/file_stream.h"
36 #include "third_party/skia/include/core/SkBitmap.h" 36 #include "third_party/skia/include/core/SkBitmap.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
38 #include "ui/gfx/geometry/size.h" 38 #include "ui/gfx/geometry/size.h"
39 #include "ui/gfx/ipc/gfx_skia_param_traits.h"
Devlin 2016/03/28 21:01:51 ditto
Mark Dittmer 2016/03/29 17:41:24 Done.
39 40
40 namespace extensions { 41 namespace extensions {
41 42
42 namespace { 43 namespace {
43 44
44 namespace errors = manifest_errors; 45 namespace errors = manifest_errors;
45 namespace keys = manifest_keys; 46 namespace keys = manifest_keys;
46 47
47 // A limit to stop us passing dangerously large canvases to the browser. 48 // A limit to stop us passing dangerously large canvases to the browser.
48 const int kMaxImageCanvas = 4096 * 4096; 49 const int kMaxImageCanvas = 4096 * 4096;
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 290
290 void Unpacker::SetError(const std::string& error) { 291 void Unpacker::SetError(const std::string& error) {
291 SetUTF16Error(base::UTF8ToUTF16(error)); 292 SetUTF16Error(base::UTF8ToUTF16(error));
292 } 293 }
293 294
294 void Unpacker::SetUTF16Error(const base::string16& error) { 295 void Unpacker::SetUTF16Error(const base::string16& error) {
295 error_message_ = error; 296 error_message_ = error;
296 } 297 }
297 298
298 } // namespace extensions 299 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698