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

Side by Side Diff: app/resource_bundle_linux.cc

Issue 259047: Move classes depending on Skia out of base/gfx and into app/gfx. Rename... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | « app/gfx/native_theme_win_unittest.cc ('k') | app/win_util.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "app/resource_bundle.h" 5 #include "app/resource_bundle.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "app/app_paths.h" 9 #include "app/app_paths.h"
10 #include "app/gfx/font.h" 10 #include "app/gfx/font.h"
11 #include "app/gfx/gtk_util.h"
11 #include "app/l10n_util.h" 12 #include "app/l10n_util.h"
12 #include "base/base_paths.h" 13 #include "base/base_paths.h"
13 #include "base/data_pack.h" 14 #include "base/data_pack.h"
14 #include "base/file_path.h" 15 #include "base/file_path.h"
15 #include "base/file_util.h" 16 #include "base/file_util.h"
16 #include "base/gfx/gtk_util.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/string_piece.h" 19 #include "base/string_piece.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
22 22
23 namespace { 23 namespace {
24 24
25 // Convert the raw image data into a GdkPixbuf. The GdkPixbuf that is returned 25 // Convert the raw image data into a GdkPixbuf. The GdkPixbuf that is returned
26 // has a ref count of 1 so the caller must call g_object_unref to free the 26 // has a ref count of 1 so the caller must call g_object_unref to free the
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 } 215 }
216 } 216 }
217 217
218 GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) { 218 GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) {
219 return GetPixbufImpl(resource_id, false); 219 return GetPixbufImpl(resource_id, false);
220 } 220 }
221 221
222 GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) { 222 GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) {
223 return GetPixbufImpl(resource_id, true); 223 return GetPixbufImpl(resource_id, true);
224 } 224 }
OLDNEW
« no previous file with comments | « app/gfx/native_theme_win_unittest.cc ('k') | app/win_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698