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

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.cc

Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/avatar_menu_item_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu_icon.cc
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index 9b8cd27e5009ca10862537bab7ce174ed78899b8..b3c2feb530f59465416d8c110db9589f77590ec2 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -271,7 +271,7 @@ class NetworkMenuIconSource : public gfx::ImageSkiaSource {
gfx::ImageSkia* images;
if (type_ == NetworkMenuIcon::ARCS) {
if (index_ >= kNumArcsImages)
- return gfx::ImageSkia();
+ return gfx::ImageSkiaRep();
images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
color_ == NetworkMenuIcon::COLOR_DARK ?
IDR_STATUSBAR_NETWORK_ARCS_DARK : IDR_STATUSBAR_NETWORK_ARCS_LIGHT);
@@ -279,7 +279,7 @@ class NetworkMenuIconSource : public gfx::ImageSkiaSource {
height = images->height() / kNumArcsImages;
} else {
if (index_ >= kNumBarsImages)
- return gfx::ImageSkia();
+ return gfx::ImageSkiaRep();
images = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
color_ == NetworkMenuIcon::COLOR_DARK ?
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/avatar_menu_item_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698