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

Side by Side Diff: ui/base/resource/resource_bundle.cc

Issue 14272007: Update the remaining include paths of base/string_piece.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_handle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ref_counted_memory.h" 12 #include "base/memory/ref_counted_memory.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/string_piece.h" 16 #include "base/strings/string_piece.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "net/base/big_endian.h" 20 #include "net/base/big_endian.h"
21 #include "skia/ext/image_operations.h" 21 #include "skia/ext/image_operations.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/layout.h" 24 #include "ui/base/layout.h"
25 #include "ui/base/resource/data_pack.h" 25 #include "ui/base/resource/data_pack.h"
26 #include "ui/base/ui_base_paths.h" 26 #include "ui/base/ui_base_paths.h"
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 // static 710 // static
711 bool ResourceBundle::DecodePNG(const unsigned char* buf, 711 bool ResourceBundle::DecodePNG(const unsigned char* buf,
712 size_t size, 712 size_t size,
713 SkBitmap* bitmap, 713 SkBitmap* bitmap,
714 bool* fell_back_to_1x) { 714 bool* fell_back_to_1x) {
715 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size); 715 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
716 return gfx::PNGCodec::Decode(buf, size, bitmap); 716 return gfx::PNGCodec::Decode(buf, size, bitmap);
717 } 717 }
718 718
719 } // namespace ui 719 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698