ui/views/focus/focus_manager_unittest_win.cc - Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/focus/focus_manager_unittest_win.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:

Index: ui/views/focus/focus_manager_unittest_win.cc

diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc

index a826405010d947776a970d97663c6edb80b4913b..6dfdecda12d55de1dde3d8582bb5fdfcac3f58f5 100644

--- a/ui/views/focus/focus_manager_unittest_win.cc

+++ b/ui/views/focus/focus_manager_unittest_win.cc

@@ -8,7 +8,7 @@

#include "base/run_loop.h"

#include "base/utf_string_conversions.h"

#include "ui/base/events/event.h"

-#include "ui/views/controls/button/text_button.h"

+#include "ui/views/controls/button/label_button.h"

#include "ui/views/focus/accelerator_handler.h"

#include "ui/views/focus/focus_manager_test.h"

#include "ui/views/widget/widget.h"

@@ -70,8 +70,8 @@ TEST_F(FocusManagerTest, FocusStoreRestore) {

// Simulate an activate, otherwise the deactivate isn't going to do anything.

SimulateActivateWindow();

- NativeTextButton* button = new NativeTextButton(NULL,

- ASCIIToUTF16("Press me"));

+ LabelButton* button = new LabelButton(NULL, ASCIIToUTF16("Press me"));

+ button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);

View* view = new View();

view->set_focusable(true);