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

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

Issue 530623002: Use qualified path for three more grit headers from ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ui_resources too Created 6 years, 3 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 | « ui/base/l10n/l10n_util_win.cc ('k') | ui/base/webui/jstemplate_builder.cc » ('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 <limits> 7 #include <limits>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/big_endian.h" 10 #include "base/big_endian.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file.h" 12 #include "base/files/file.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ref_counted_memory.h" 15 #include "base/memory/ref_counted_memory.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/stl_util.h" 18 #include "base/stl_util.h"
19 #include "base/strings/string_piece.h" 19 #include "base/strings/string_piece.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "base/synchronization/lock.h" 21 #include "base/synchronization/lock.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "grit/app_locale_settings.h"
24 #include "skia/ext/image_operations.h" 23 #include "skia/ext/image_operations.h"
25 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
26 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/layout.h" 26 #include "ui/base/layout.h"
28 #include "ui/base/resource/data_pack.h" 27 #include "ui/base/resource/data_pack.h"
29 #include "ui/base/ui_base_paths.h" 28 #include "ui/base/ui_base_paths.h"
30 #include "ui/base/ui_base_switches.h" 29 #include "ui/base/ui_base_switches.h"
31 #include "ui/gfx/codec/jpeg_codec.h" 30 #include "ui/gfx/codec/jpeg_codec.h"
32 #include "ui/gfx/codec/png_codec.h" 31 #include "ui/gfx/codec/png_codec.h"
33 #include "ui/gfx/image/image_skia.h" 32 #include "ui/gfx/image/image_skia.h"
34 #include "ui/gfx/image/image_skia_source.h" 33 #include "ui/gfx/image/image_skia_source.h"
35 #include "ui/gfx/safe_integer_conversions.h" 34 #include "ui/gfx/safe_integer_conversions.h"
36 #include "ui/gfx/screen.h" 35 #include "ui/gfx/screen.h"
37 #include "ui/gfx/size_conversions.h" 36 #include "ui/gfx/size_conversions.h"
37 #include "ui/strings/grit/app_locale_settings.h"
38 38
39 #if defined(OS_ANDROID) 39 #if defined(OS_ANDROID)
40 #include "ui/base/resource/resource_bundle_android.h" 40 #include "ui/base/resource/resource_bundle_android.h"
41 #endif 41 #endif
42 42
43 #if defined(OS_CHROMEOS) 43 #if defined(OS_CHROMEOS)
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/gfx/platform_font_pango.h" 45 #include "ui/gfx/platform_font_pango.h"
46 #endif 46 #endif
47 47
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 // static 851 // static
852 bool ResourceBundle::DecodePNG(const unsigned char* buf, 852 bool ResourceBundle::DecodePNG(const unsigned char* buf,
853 size_t size, 853 size_t size,
854 SkBitmap* bitmap, 854 SkBitmap* bitmap,
855 bool* fell_back_to_1x) { 855 bool* fell_back_to_1x) {
856 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size); 856 *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
857 return gfx::PNGCodec::Decode(buf, size, bitmap); 857 return gfx::PNGCodec::Decode(buf, size, bitmap);
858 } 858 }
859 859
860 } // namespace ui 860 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/l10n/l10n_util_win.cc ('k') | ui/base/webui/jstemplate_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698