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

Unified Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
Index: chrome/browser/chromeos/options/network_config_view.cc
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index f7d5fde92a527ca43ce40e6f098b695be1e81b46..3227becf5d73c31ee21cd4b0da1be675da737fc5 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -240,9 +240,9 @@ void ControlledSettingIndicatorView::OnMouseExited(
void ControlledSettingIndicatorView::Init() {
color_image_ = ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_CONTROLLED_SETTING_MANDATORY).ToSkBitmap();
+ IDR_CONTROLLED_SETTING_MANDATORY).ToImageSkia();
gray_image_ = ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_CONTROLLED_SETTING_MANDATORY_GRAY).ToSkBitmap();
+ IDR_CONTROLLED_SETTING_MANDATORY_GRAY).ToImageSkia();
image_view_ = new views::ImageView();
// Disable |image_view_| so mouse events propagate to the parent.
image_view_->SetEnabled(false);

Powered by Google App Engine
This is Rietveld 408576698