Make LabelButton STYLE_NATIVE_TEXTBUTTON focusable; etc.

ui/views/focus/focus_traversal_unittest.cc

 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h"
 
+#include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/radio_button.h"
-#include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/focus_manager_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 int count = 1;
 
@@ skipping 65 matching lines @@
  public:
   PaneView() : focus_search_(NULL) {}
 
   // If this method is called, this view will use GetPaneFocusTraversable to
   // have this provided FocusSearch used instead of the default one, allowing
   // you to trap focus within the pane.
   void EnablePaneFocus(FocusSearch* focus_search) {
     focus_search_ = focus_search;
   }
 
-  // Overridden from views::View:
+  // Overridden from View:
   virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE {
     if (focus_search_)
       return this;
     else
       return NULL;
   }
 
-  // Overridden from views::FocusTraversable:
-  virtual views::FocusSearch* GetFocusSearch() OVERRIDE {
+  // Overridden from FocusTraversable:
+  virtual FocusSearch* GetFocusSearch() OVERRIDE {
     return focus_search_;
   }
   virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE {
     return NULL;
   }
   virtual View* GetFocusTraversableParentView() OVERRIDE {
     return NULL;
   }
 
  private:
@@ skipping 225 matching lines @@
   label->SetBounds(label_x, y, label_width, label_height);
 
   text_field = new Textfield();
   text_field->set_id(kKiwiTextfieldID);
   left_container_->AddChildView(text_field);
   text_field->SetBounds(label_x + label_width + 5, y,
                         text_field_width, label_height);
 
   y += label_height + gap_between_labels;
 
-  NativeTextButton* button = new NativeTextButton(NULL,
-                                                  ASCIIToUTF16("Click me"));
+  LabelButton* button = new LabelButton(NULL, ASCIIToUTF16("Click me"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   button->SetBounds(label_x, y + 10, 80, 30);
   button->set_id(kFruitButtonID);
   left_container_->AddChildView(button);
   y += 40;
 
   cb =  new Checkbox(ASCIIToUTF16("This is another check box"));
   cb->SetBounds(label_x + label_width + 5, y, 180, 20);
   cb->set_id(kFruitCheckBoxID);
   left_container_->AddChildView(cb);
   y += 20;
@@ skipping 74 matching lines @@
     Link* link = new Link(ASCIIToUTF16(kTitles[i]));
     link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     link->set_id(kIDs[i]);
     scroll_content->AddChildView(link);
     link->SetBounds(5, y, 300, 15);
     y += 15;
   }
 
   y = 250;
   int width = 60;
-  button = new NativeTextButton(NULL, ASCIIToUTF16("OK"));
+  button = new LabelButton(NULL, ASCIIToUTF16("OK"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   button->set_id(kOKButtonID);
   button->SetIsDefault(true);
 
   GetContentsView()->AddChildView(button);
   button->SetBounds(150, y, width, 30);
 
-  button = new NativeTextButton(NULL, ASCIIToUTF16("Cancel"));
+  button = new LabelButton(NULL, ASCIIToUTF16("Cancel"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   button->set_id(kCancelButtonID);
   GetContentsView()->AddChildView(button);
   button->SetBounds(220, y, width, 30);
 
-  button = new NativeTextButton(NULL, ASCIIToUTF16("Help"));
+  button = new LabelButton(NULL, ASCIIToUTF16("Help"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   button->set_id(kHelpButtonID);
   GetContentsView()->AddChildView(button);
   button->SetBounds(290, y, width, 30);
 
   y += 40;
 
   View* contents = NULL;
   Link* link = NULL;
 
   // Left bottom box with style checkboxes.
@@ skipping 32 matching lines @@
   style_tab_->AddTab(ASCIIToUTF16("Other"), new View());
 
   // Right bottom box with search.
   contents = new View();
   contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
   text_field = new Textfield();
   contents->AddChildView(text_field);
   text_field->SetBounds(10, 10, 100, 20);
   text_field->set_id(kSearchTextfieldID);
 
-  button = new NativeTextButton(NULL, ASCIIToUTF16("Search"));
+  button = new LabelButton(NULL, ASCIIToUTF16("Search"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
   button->SetBounds(112, 5, 60, 30);
   button->set_id(kSearchButtonID);
 
   link = new Link(ASCIIToUTF16("Help"));
   link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   link->set_id(kHelpLinkID);
   contents->AddChildView(link);
   link->SetBounds(175, 10, 30, 20);
 
   search_border_view_ = new BorderView(contents);
   search_border_view_->set_id(kSearchContainerID);
 
   GetContentsView()->AddChildView(search_border_view_);
   search_border_view_->SetBounds(300, y, 240, 50);
 
   y += 60;
 
   contents = new View();
   contents->set_focusable(true);
   contents->set_background(Background::CreateSolidBackground(SK_ColorBLUE));
   contents->set_id(kThumbnailContainerID);
-  button = new NativeTextButton(NULL, ASCIIToUTF16("Star"));
+  button = new LabelButton(NULL, ASCIIToUTF16("Star"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
   button->SetBounds(5, 5, 50, 30);
   button->set_id(kThumbnailStarID);
-  button = new NativeTextButton(NULL, ASCIIToUTF16("SuperStar"));
+  button = new LabelButton(NULL, ASCIIToUTF16("SuperStar"));
+  button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
   contents->AddChildView(button);
   button->SetBounds(60, 5, 100, 30);
   button->set_id(kThumbnailSuperStarID);
 
   GetContentsView()->AddChildView(contents);
   contents->SetBounds(250, y, 200, 50);
   // We can only call RadioButton::SetChecked() on the radio-button is part of
   // the view hierarchy.
   radio_button_to_check->SetChecked(true);
 }
 
 TEST_F(FocusTraversalTest, NormalTraversal) {
   const int kTraversalIDs[] = { kTopCheckBoxID,  kAppleTextfieldID,
       kOrangeTextfieldID, kBananaTextfieldID, kKiwiTextfieldID,
       kFruitButtonID, kFruitCheckBoxID, kComboboxID, kBroccoliButtonID,
       kRosettaLinkID, kStupeurEtTremblementLinkID,
       kDinerGameLinkID, kRidiculeLinkID, kClosetLinkID, kVisitingLinkID,
       kAmelieLinkID, kJoyeuxNoelLinkID, kCampingLinkID, kBriceDeNiceLinkID,
       kTaxiLinkID, kAsterixLinkID, kOKButtonID, kCancelButtonID, kHelpButtonID,
       kStyleContainerID, kBoldCheckBoxID, kItalicCheckBoxID,
       kUnderlinedCheckBoxID, kStyleHelpLinkID, kStyleTextEditID,
       kSearchTextfieldID, kSearchButtonID, kHelpLinkID,
       kThumbnailContainerID, kThumbnailStarID, kThumbnailSuperStarID };
 
-  // Uncomment the following line if you want to test manually the UI of this
-  // test.
-  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
+  // Uncomment the following line to manually test the UI of this test.
+  // base::RunLoop(new AcceleratorHandler()).Run();
 
   // Let's traverse the whole focus hierarchy (several times, to make sure it
   // loops OK).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 30 matching lines @@
       kSearchButtonID, kThumbnailContainerID, kThumbnailStarID,
       kThumbnailSuperStarID };
 
   // Let's disable some views.
   for (size_t i = 0; i < arraysize(kDisabledIDs); i++) {
     View* v = FindViewByID(kDisabledIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetEnabled(false);
   }
 
-  // Uncomment the following line if you want to test manually the UI of this
-  // test.
-  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
+  // Uncomment the following line to manually test the UI of this test.
+  // base::RunLoop(new AcceleratorHandler()).Run();
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 29 matching lines @@
       kStyleTextEditID, kSearchTextfieldID, kSearchButtonID, kHelpLinkID };
 
 
   // Let's make some views invisible.
   for (size_t i = 0; i < arraysize(kInvisibleIDs); i++) {
     View* v = FindViewByID(kInvisibleIDs[i]);
     ASSERT_TRUE(v != NULL);
     v->SetVisible(false);
   }
 
-  // Uncomment the following line if you want to test manually the UI of this
-  // test.
-  // MessageLoopForUI::current()->RunWithDispatcher(new AcceleratorHandler());
+  // Uncomment the following line to manually test the UI of this test.
+  // base::RunLoop(new AcceleratorHandler()).Run();
 
   View* focused_view;
   // Let's do one traversal (several times, to make sure it loops ok).
   GetFocusManager()->ClearFocus();
   for (int i = 0; i < 3; ++i) {
     for (size_t j = 0; j < arraysize(kTraversalIDs); j++) {
       GetFocusManager()->AdvanceFocus(false);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
@@ skipping 85 matching lines @@
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 }  // namespace views