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

Unified Diff: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc

Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: back out the changes to one_click_signin_bubble_view.* Created 7 years, 8 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
Index: chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index f49602615b6986a0f1e760d15477764fb559efc3..051bfa724dca7837a5542c59ad1acbeee0d02741 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/notification_service.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/grid_layout.h"
#include "ui/views/test/test_views_delegate.h"
@@ -167,17 +167,14 @@ TEST_F(AccessibilityEventRouterViewsTest, TestFocusNotification) {
// Create a contents view with 3 buttons.
views::View* contents = new views::View();
- views::LabelButton* button1 = new views::LabelButton(
+ views::NativeTextButton* button1 = new views::NativeTextButton(
NULL, ASCIIToUTF16(kButton1ASCII));
- button1->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
contents->AddChildView(button1);
- views::LabelButton* button2 = new views::LabelButton(
+ views::NativeTextButton* button2 = new views::NativeTextButton(
NULL, ASCIIToUTF16(kButton2ASCII));
- button2->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
contents->AddChildView(button2);
- views::LabelButton* button3 = new views::LabelButton(
+ views::NativeTextButton* button3 = new views::NativeTextButton(
NULL, ASCIIToUTF16(kButton3ASCII));
- button3->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
contents->AddChildView(button3);
// Put the view in a window.
@@ -235,9 +232,8 @@ TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
views::View* contents = new ViewWithNameAndRole(
ASCIIToUTF16(kToolbarNameASCII),
ui::AccessibilityTypes::ROLE_TOOLBAR);
- views::LabelButton* button = new views::LabelButton(
+ views::NativeTextButton* button = new views::NativeTextButton(
NULL, ASCIIToUTF16(kButtonNameASCII));
- button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
contents->AddChildView(button);
// Put the view in a window.
@@ -280,9 +276,8 @@ TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
ui::AccessibilityTypes::ROLE_ALERT);
views::Label* label = new views::Label(ASCIIToUTF16(kAlertTextASCII));
contents->AddChildView(label);
- views::LabelButton* button = new views::LabelButton(
+ views::NativeTextButton* button = new views::NativeTextButton(
NULL, ASCIIToUTF16(kButtonNameASCII));
- button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
contents->AddChildView(button);
// Put the view in a window.
« no previous file with comments | « chrome/browser/first_run/try_chrome_dialog_view.cc ('k') | chrome/browser/ui/views/chrome_to_mobile_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698