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

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

Issue 832953002: Cleanup: Update the path to gfx size headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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 "chrome/utility/extensions/unpacker.h" 5 #include "chrome/utility/extensions/unpacker.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/files/file_enumerator.h" 9 #include "base/files/file_enumerator.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 15 matching lines...) Expand all
26 #include "extensions/common/extensions_client.h" 26 #include "extensions/common/extensions_client.h"
27 #include "extensions/common/file_util.h" 27 #include "extensions/common/file_util.h"
28 #include "extensions/common/manifest.h" 28 #include "extensions/common/manifest.h"
29 #include "extensions/common/manifest_constants.h" 29 #include "extensions/common/manifest_constants.h"
30 #include "extensions/common/manifest_handlers/default_locale_handler.h" 30 #include "extensions/common/manifest_handlers/default_locale_handler.h"
31 #include "ipc/ipc_message_utils.h" 31 #include "ipc/ipc_message_utils.h"
32 #include "net/base/file_stream.h" 32 #include "net/base/file_stream.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "third_party/zlib/google/zip.h" 34 #include "third_party/zlib/google/zip.h"
35 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/gfx/size.h" 36 #include "ui/gfx/geometry/size.h"
37 37
38 namespace extensions { 38 namespace extensions {
39 39
40 namespace { 40 namespace {
41 41
42 namespace errors = manifest_errors; 42 namespace errors = manifest_errors;
43 namespace keys = manifest_keys; 43 namespace keys = manifest_keys;
44 44
45 // A limit to stop us passing dangerously large canvases to the browser. 45 // A limit to stop us passing dangerously large canvases to the browser.
46 const int kMaxImageCanvas = 4096 * 4096; 46 const int kMaxImageCanvas = 4096 * 4096;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 319
320 void Unpacker::SetError(const std::string &error) { 320 void Unpacker::SetError(const std::string &error) {
321 SetUTF16Error(base::UTF8ToUTF16(error)); 321 SetUTF16Error(base::UTF8ToUTF16(error));
322 } 322 }
323 323
324 void Unpacker::SetUTF16Error(const base::string16& error) { 324 void Unpacker::SetUTF16Error(const base::string16& error) {
325 error_message_ = error; 325 error_message_ = error;
326 } 326 }
327 327
328 } // namespace extensions 328 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/utility/cloud_print/bitmap_image.h ('k') | chromecast/browser/android/cast_window_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698