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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/string16.h" 12 #include "base/string16.h"
13 #include "chrome/browser/chromeos/cros/network_library.h" 13 #include "chrome/browser/chromeos/cros/network_library.h"
14 #include "chrome/browser/chromeos/cros/network_ui_data.h" 14 #include "chrome/browser/chromeos/cros/network_ui_data.h"
15 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow 15 #include "ui/gfx/native_widget_types.h" // gfx::NativeWindow
16 #include "ui/views/controls/button/button.h" // views::ButtonListener 16 #include "ui/views/controls/button/button.h" // views::ButtonListener
17 #include "ui/views/window/dialog_delegate.h" 17 #include "ui/views/window/dialog_delegate.h"
18 18
19 namespace gfx {
20 class ImageSkia;
21 }
22
19 namespace views { 23 namespace views {
20 class ImageView; 24 class ImageView;
21 class NativeTextButton; 25 class NativeTextButton;
22 class View; 26 class View;
23 } 27 }
24 28
25 namespace chromeos { 29 namespace chromeos {
26 30
27 class ChildNetworkConfigView; 31 class ChildNetworkConfigView;
28 32
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 virtual void Layout() OVERRIDE; 171 virtual void Layout() OVERRIDE;
168 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; 172 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
169 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; 173 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
170 174
171 private: 175 private:
172 // Initializes the view. 176 // Initializes the view.
173 void Init(); 177 void Init();
174 178
175 bool managed_; 179 bool managed_;
176 views::ImageView* image_view_; 180 views::ImageView* image_view_;
177 const SkBitmap* gray_image_; 181 const gfx::ImageSkia* gray_image_;
178 const SkBitmap* color_image_; 182 const gfx::ImageSkia* color_image_;
179 183
180 DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView); 184 DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView);
181 }; 185 };
182 186
183 } // namespace chromeos 187 } // namespace chromeos
184 188
185 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_ 189 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_NETWORK_CONFIG_VIEW_H_
OLDNEW
« 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