| Index: ui/views/focus/focus_traversal_unittest.cc
|
| diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
|
| index 79e22efcb248309a2c9eafa1844d17b520365551..67bf08a827c1af28b5c89c13b262320937f7a945 100644
|
| --- a/ui/views/focus/focus_traversal_unittest.cc
|
| +++ b/ui/views/focus/focus_traversal_unittest.cc
|
| @@ -355,14 +355,14 @@ void FocusTraversalTest::InitContentView() {
|
|
|
| y += label_height + gap_between_labels;
|
|
|
| - LabelButton* button = new LabelButton(NULL, ASCIIToUTF16("Click me"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + LabelButton* button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("Click me"));
|
| 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 = 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);
|
| @@ -451,22 +451,22 @@ void FocusTraversalTest::InitContentView() {
|
|
|
| y = 250;
|
| int width = 60;
|
| - button = new LabelButton(NULL, ASCIIToUTF16("OK"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("OK"));
|
| button->set_id(kOKButtonID);
|
| button->SetIsDefault(true);
|
|
|
| GetContentsView()->AddChildView(button);
|
| button->SetBounds(150, y, width, 30);
|
|
|
| - button = new LabelButton(NULL, ASCIIToUTF16("Cancel"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("Cancel"));
|
| button->set_id(kCancelButtonID);
|
| GetContentsView()->AddChildView(button);
|
| button->SetBounds(220, y, width, 30);
|
|
|
| - button = new LabelButton(NULL, ASCIIToUTF16("Help"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("Help"));
|
| button->set_id(kHelpButtonID);
|
| GetContentsView()->AddChildView(button);
|
| button->SetBounds(290, y, width, 30);
|
| @@ -519,8 +519,8 @@ void FocusTraversalTest::InitContentView() {
|
| text_field->SetBounds(10, 10, 100, 20);
|
| text_field->set_id(kSearchTextfieldID);
|
|
|
| - button = new LabelButton(NULL, ASCIIToUTF16("Search"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("Search"));
|
| contents->AddChildView(button);
|
| button->SetBounds(112, 5, 60, 30);
|
| button->set_id(kSearchButtonID);
|
| @@ -543,13 +543,13 @@ void FocusTraversalTest::InitContentView() {
|
| contents->SetFocusable(true);
|
| contents->set_background(Background::CreateSolidBackground(SK_ColorBLUE));
|
| contents->set_id(kThumbnailContainerID);
|
| - button = new LabelButton(NULL, ASCIIToUTF16("Star"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("Star"));
|
| contents->AddChildView(button);
|
| button->SetBounds(5, 5, 50, 30);
|
| button->set_id(kThumbnailStarID);
|
| - button = new LabelButton(NULL, ASCIIToUTF16("SuperStar"));
|
| - button->SetStyle(Button::STYLE_BUTTON);
|
| + button = new LabelButton(nullptr);
|
| + button->InitAsButton(ASCIIToUTF16("SuperStar"));
|
| contents->AddChildView(button);
|
| button->SetBounds(60, 5, 100, 30);
|
| button->set_id(kThumbnailSuperStarID);
|
|
|