Move text_field.cc and rename the class to Textfield in preparation for porti...

chrome/browser/views/options/content_page_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/options/content_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 10 matching lines @@
 #include "chrome/browser/views/options/options_group_view.h"
 #include "chrome/browser/views/options/passwords_exceptions_window_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #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"
 
 namespace {
 
 static const int kPopupBlockingRadioGroup = 1;
 static const int kPasswordSavingRadioGroup = 2;
 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
 
 ////////////////////////////////////////////////////////////////////////////////
 // FileDisplayArea
 
 class FileDisplayArea : public views::View {
  public:
   FileDisplayArea();
   virtual ~FileDisplayArea();
 
   void SetFile(const FilePath& file_path);
 
   // views::View overrides:
   virtual void Paint(gfx::Canvas* canvas);
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
  protected:
   // views::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
 
  private:
   void Init();
 
-  views::TextField* text_field_;
+  views::Textfield* text_field_;
   SkColor text_field_background_color_;
 
   gfx::Rect icon_bounds_;
 
   bool initialized_;
 
   static void InitClass();
   static SkBitmap default_folder_icon_;
 
   DISALLOW_EVIL_CONSTRUCTORS(FileDisplayArea);
 };
 
 // static
 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();
 }
 
 FileDisplayArea::~FileDisplayArea() {
 }
 
 void FileDisplayArea::SetFile(const FilePath& file_path) {
   // Force file path to have LTR directionality.
@@ skipping 16 matching lines @@
   // Mirror left point for icon_bounds_ to draw icon in RTL locales correctly.
   canvas->DrawBitmapInt(default_folder_icon_,
                         MirroredLeftPointForRect(icon_bounds_),
                         icon_bounds_.y());
 }
 
 void FileDisplayArea::Layout() {
   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() {
   return gfx::Size(kFileIconSize + 2 * kFileIconVerticalSpacing,
                    kFileIconSize + 2 * kFileIconHorizontalSpacing);
 }
 
 void FileDisplayArea::ViewHierarchyChanged(bool is_add,
                                            views::View* parent,
                                            views::View* child) {
@@ skipping 402 matching lines @@
 
   themes_group_ = new OptionsGroupView(
     contents, l10n_util::GetString(IDS_THEMES_GROUP_NAME),
     L"", false);
 }
 
 void ContentPageView::UpdateDownloadDirectoryDisplay() {
   download_default_download_location_display_->SetFile(
       FilePath::FromWStringHack(default_download_location_.GetValue()));
 }