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

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

Issue 11421164: Migrate CollectedCookiesViews to Chrome style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/focus/focus_traversal_unittest.cc » ('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 5c5dcf7b1c932bae7799dc6c12dfff1a7bef9151..332d65d415bca979767a45c8572f1dace0900c06 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -178,7 +178,8 @@ class TestTextfield : public Textfield {
class TestTabbedPane : public TabbedPane {
public:
- TestTabbedPane() {}
+ TestTabbedPane()
+ : TabbedPane(false) {}
virtual gfx::NativeView TestGetNativeControlView() {
return native_tabbed_pane_->GetTestingHandle();
}
@@ -214,9 +215,9 @@ TEST_F(FocusManagerTest, DISABLED_FocusNativeControls) {
TEST_F(FocusManagerTest, ContainsView) {
View* view = new View();
scoped_ptr<View> detached_view(new View());
- TabbedPane* tabbed_pane = new TabbedPane();
+ TabbedPane* tabbed_pane = new TabbedPane(false);
tabbed_pane->set_use_native_win_control(true);
- TabbedPane* nested_tabbed_pane = new TabbedPane();
+ TabbedPane* nested_tabbed_pane = new TabbedPane(false);
nested_tabbed_pane->set_use_native_win_control(true);
NativeTextButton* tab_button = new NativeTextButton(
NULL, ASCIIToUTF16("tab button"));
@@ -640,7 +641,7 @@ class FocusManagerDtorTest : public FocusManagerTest {
#if !defined(USE_AURA)
TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
// Setup views hierarchy.
- TabbedPane* tabbed_pane = new TabbedPane();
+ TabbedPane* tabbed_pane = new TabbedPane(false);
tabbed_pane->set_use_native_win_control(true);
GetContentsView()->AddChildView(tabbed_pane);
« no previous file with comments | « ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc ('k') | ui/views/focus/focus_traversal_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698