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

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

Issue 9815006: ui/gfx: Remove the deprecated "operator const GdkPixbuf*" from Image API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc ('k') | ui/gfx/image/image.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 "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 images_[key] = image; 84 images_[key] = image;
85 return image; 85 return image;
86 } 86 }
87 87
88 LOG(WARNING) << "Unable to pixbuf with id " << resource_id; 88 LOG(WARNING) << "Unable to pixbuf with id " << resource_id;
89 NOTREACHED(); // Want to assert in debug mode. 89 NOTREACHED(); // Want to assert in debug mode.
90 return GetEmptyImage(); 90 return GetEmptyImage();
91 } 91 }
92 92
93 GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) { 93 GdkPixbuf* ResourceBundle::GetRTLEnabledPixbufNamed(int resource_id) {
94 return *GetPixbufImpl(resource_id, true); 94 return GetPixbufImpl(resource_id, true)->ToGdkPixbuf();
95 } 95 }
96 96
97 gfx::Image& ResourceBundle::GetRTLEnabledImageNamed(int resource_id) { 97 gfx::Image& ResourceBundle::GetRTLEnabledImageNamed(int resource_id) {
98 return *GetPixbufImpl(resource_id, true); 98 return *GetPixbufImpl(resource_id, true);
99 } 99 }
100 100
101 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc ('k') | ui/gfx/image/image.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698