Variety of tweaks to View API.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2011 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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
@@ skipping 149 matching lines @@
     widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(textfield_);
 
     textfield_view_
         = static_cast<NativeTextfieldViews*>(textfield_->native_wrapper());
-    textfield_->SetID(1);
+    textfield_->set_id(1);
 
     for (int i = 1; i < count; i++) {
       Textfield* textfield = new Textfield(style);
       container->AddChildView(textfield);
-      textfield->SetID(i + 1);
+      textfield->set_id(i + 1);
     }
 
     DCHECK(textfield_view_);
     model_ = textfield_view_->model_.get();
     model_->ClearEditHistory();
 
     input_method_ = new MockInputMethod();
     widget_->native_widget()->ReplaceInputMethod(input_method_);
 
     // Assumes the Widget is always focused.
@@ skipping 297 matching lines @@
   SendKeyEvent(ui::VKEY_LEFT, false, true);
   SendKeyEvent(ui::VKEY_DELETE);
   EXPECT_STR_EQ("one two", textfield_->text());
   EXPECT_STR_EQ("one two", last_contents_);
 }
 
 TEST_F(NativeTextfieldViewsTest, FocusTraversalTest) {
   InitTextfields(Textfield::STYLE_DEFAULT, 3);
   textfield_->RequestFocus();
 
-  EXPECT_EQ(1, GetFocusedView()->GetID());
+  EXPECT_EQ(1, GetFocusedView()->id());
   widget_->GetFocusManager()->AdvanceFocus(false);
-  EXPECT_EQ(2, GetFocusedView()->GetID());
+  EXPECT_EQ(2, GetFocusedView()->id());
   widget_->GetFocusManager()->AdvanceFocus(false);
-  EXPECT_EQ(3, GetFocusedView()->GetID());
+  EXPECT_EQ(3, GetFocusedView()->id());
   // Cycle back to the first textfield.
   widget_->GetFocusManager()->AdvanceFocus(false);
-  EXPECT_EQ(1, GetFocusedView()->GetID());
+  EXPECT_EQ(1, GetFocusedView()->id());
 
   widget_->GetFocusManager()->AdvanceFocus(true);
-  EXPECT_EQ(3, GetFocusedView()->GetID());
+  EXPECT_EQ(3, GetFocusedView()->id());
   widget_->GetFocusManager()->AdvanceFocus(true);
-  EXPECT_EQ(2, GetFocusedView()->GetID());
+  EXPECT_EQ(2, GetFocusedView()->id());
   widget_->GetFocusManager()->AdvanceFocus(true);
-  EXPECT_EQ(1, GetFocusedView()->GetID());
+  EXPECT_EQ(1, GetFocusedView()->id());
   // Cycle back to the last textfield.
   widget_->GetFocusManager()->AdvanceFocus(true);
-  EXPECT_EQ(3, GetFocusedView()->GetID());
+  EXPECT_EQ(3, GetFocusedView()->id());
 
   // Request focus should still work.
   textfield_->RequestFocus();
-  EXPECT_EQ(1, GetFocusedView()->GetID());
+  EXPECT_EQ(1, GetFocusedView()->id());
 
   // Test if clicking on textfield view sets the focus to textfield_.
   widget_->GetFocusManager()->AdvanceFocus(true);
-  EXPECT_EQ(3, GetFocusedView()->GetID());
+  EXPECT_EQ(3, GetFocusedView()->id());
   MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
   textfield_view_->OnMousePressed(click);
-  EXPECT_EQ(1, GetFocusedView()->GetID());
+  EXPECT_EQ(1, GetFocusedView()->id());
 }
 
 void VerifyTextfieldContextMenuContents(bool textfield_has_selection,
     ui::MenuModel* menu_model) {
   EXPECT_TRUE(menu_model->IsEnabledAt(4 /* Separator */));
   EXPECT_TRUE(menu_model->IsEnabledAt(5 /* SELECT ALL */));
   EXPECT_EQ(textfield_has_selection, menu_model->IsEnabledAt(0 /* CUT */));
   EXPECT_EQ(textfield_has_selection, menu_model->IsEnabledAt(1 /* COPY */));
   EXPECT_EQ(textfield_has_selection, menu_model->IsEnabledAt(3 /* DELETE */));
   string16 str;
@@ skipping 542 matching lines @@
   EXPECT_STR_EQ("a23", textfield_->text());
   SendKeyEvent(ui::VKEY_B);
   EXPECT_STR_EQ("ab3", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("123", textfield_->text());
   SendKeyEvent(ui::VKEY_Y, false, true);
   EXPECT_STR_EQ("ab3", textfield_->text());
 }
 
 }  // namespace views