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

Unified Diff: ui/views/focus/focus_manager_unittest.cc

Issue 10797046: (Views only): Allow choosing between NativeTabbedPaneView and NativeTabbedPaneWin on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "Fix file header *sigh*" Created 8 years, 5 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
« no previous file with comments | « ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager_unittest.cc
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index c545bb81cf052e92f1f3b43cd5873eba1ea3bc23..dd36d42cf442c13ea1a6ec88f635f7ef88b24c2e 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -176,6 +176,7 @@ class TestTabbedPane : public TabbedPane {
TEST_F(FocusManagerTest, FAILS_FocusNativeControls) {
TestTextfield* textfield = new TestTextfield();
TestTabbedPane* tabbed_pane = new TestTabbedPane();
+ tabbed_pane->set_use_native_win_control(true);
TestTextfield* textfield2 = new TestTextfield();
GetContentsView()->AddChildView(textfield);
@@ -201,7 +202,9 @@ TEST_F(FocusManagerTest, ContainsView) {
View* view = new View();
scoped_ptr<View> detached_view(new View());
TabbedPane* tabbed_pane = new TabbedPane();
+ tabbed_pane->set_use_native_win_control(true);
TabbedPane* nested_tabbed_pane = new TabbedPane();
+ nested_tabbed_pane->set_use_native_win_control(true);
NativeTextButton* tab_button = new NativeTextButton(
NULL, ASCIIToUTF16("tab button"));
@@ -625,6 +628,7 @@ class FocusManagerDtorTest : public FocusManagerTest {
TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
// Setup views hierarchy.
TabbedPane* tabbed_pane = new TabbedPane();
+ tabbed_pane->set_use_native_win_control(true);
GetContentsView()->AddChildView(tabbed_pane);
NativeButtonDtorTracked* button = new NativeButtonDtorTracked(
« no previous file with comments | « ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698