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

Unified Diff: views/controls/button/native_button.h

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 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
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | views/controls/button/native_button_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/button/native_button.h
===================================================================
--- views/controls/button/native_button.h (revision 16106)
+++ views/controls/button/native_button.h (working copy)
@@ -9,7 +9,9 @@
#include "views/controls/button/button.h"
#include "views/controls/button/native_button_wrapper.h"
-class ChromeFont;
+namespace gfx {
+class Font;
+}
namespace views {
@@ -27,8 +29,8 @@
std::wstring label() const { return label_; }
// Sets the font to be used when displaying the button's label.
- void set_font(const ChromeFont& font) { font_ = font; }
- const ChromeFont& font() const { return font_; }
+ void set_font(const gfx::Font& font) { font_ = font; }
+ const gfx::Font& font() const { return font_; }
// Sets/Gets whether or not the button appears and behaves as the default
// button in its current context.
@@ -80,7 +82,7 @@
bool is_default_;
// The font used to render the button label.
- ChromeFont font_;
+ gfx::Font font_;
// True if the button should ignore the minimum size for the platform. Default
// is false. Set to true to create narrower buttons.
« no previous file with comments | « chrome/browser/views/tabs/tab_renderer.cc ('k') | views/controls/button/native_button_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698