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

Unified Diff: chrome/browser/views/options/content_page_view.cc

Issue 115825: Move text_field.cc and rename the class to Textfield in preparation for porti... (Closed) Base URL: svn://chrome-svn/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/new_profile_dialog.cc ('k') | chrome/browser/views/options/cookies_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/options/content_page_view.cc
===================================================================
--- chrome/browser/views/options/content_page_view.cc (revision 17006)
+++ chrome/browser/views/options/content_page_view.cc (working copy)
@@ -28,7 +28,7 @@
#include "skia/ext/skia_utils_win.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "views/controls/button/radio_button.h"
-#include "views/controls/text_field.h"
+#include "views/controls/textfield/textfield.h"
#include "views/grid_layout.h"
#include "views/standard_layout.h"
#include "views/widget/widget.h"
@@ -40,7 +40,7 @@
static const int kFileIconSize = 16;
static const int kFileIconVerticalSpacing = 3;
static const int kFileIconHorizontalSpacing = 3;
-static const int kFileIconTextFieldSpacing = 3;
+static const int kFileIconTextfieldSpacing = 3;
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@
private:
void Init();
- views::TextField* text_field_;
+ views::Textfield* text_field_;
SkColor text_field_background_color_;
gfx::Rect icon_bounds_;
@@ -84,7 +84,7 @@
SkBitmap FileDisplayArea::default_folder_icon_;
FileDisplayArea::FileDisplayArea()
- : text_field_(new views::TextField),
+ : text_field_(new views::Textfield),
text_field_background_color_(0),
initialized_(false) {
InitClass();
@@ -121,11 +121,11 @@
icon_bounds_.SetRect(kFileIconHorizontalSpacing, kFileIconVerticalSpacing,
kFileIconSize, kFileIconSize);
gfx::Size ps = text_field_->GetPreferredSize();
- text_field_->SetBounds(icon_bounds_.right() + kFileIconTextFieldSpacing,
+ text_field_->SetBounds(icon_bounds_.right() + kFileIconTextfieldSpacing,
(height() - ps.height()) / 2,
width() - icon_bounds_.right() -
kFileIconHorizontalSpacing -
- kFileIconTextFieldSpacing, ps.height());
+ kFileIconTextfieldSpacing, ps.height());
}
gfx::Size FileDisplayArea::GetPreferredSize() {
« no previous file with comments | « chrome/browser/views/new_profile_dialog.cc ('k') | chrome/browser/views/options/cookies_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698