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

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

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: Rebased 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.h
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 9a860ab7ae7c5e8f1ab886ed9847f5828cfce54e..8321bd7df0c3dab5b70b584b41240168cc8a905d 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -16,6 +16,10 @@
#include "ui/views/controls/button/button.h" // views::ButtonListener
#include "ui/views/window/dialog_delegate.h"
+namespace gfx {
+class ImageSkia;
+}
+
namespace views {
class ImageView;
class NativeTextButton;
@@ -174,8 +178,8 @@ class ControlledSettingIndicatorView : public views::View {
bool managed_;
views::ImageView* image_view_;
- const SkBitmap* gray_image_;
- const SkBitmap* color_image_;
+ const gfx::ImageSkia* gray_image_;
+ const gfx::ImageSkia* color_image_;
DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView);
};
« no previous file with comments | « chrome/browser/chromeos/login/take_photo_view.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698