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

Side by Side Diff: ui/views/focus/focus_traversal_unittest.cc

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Additional cleanup; sync and rebase. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/focus/focus_manager.h" 5 #include "ui/views/focus/focus_manager.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "ui/base/models/combobox_model.h" 10 #include "ui/base/models/combobox_model.h"
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 link = new Link(ASCIIToUTF16("Help")); 500 link = new Link(ASCIIToUTF16("Help"));
501 contents->AddChildView(link); 501 contents->AddChildView(link);
502 link->SetBounds(10, 35, 70, 10); 502 link->SetBounds(10, 35, 70, 10);
503 link->set_id(kStyleHelpLinkID); 503 link->set_id(kStyleHelpLinkID);
504 504
505 text_field = new Textfield(); 505 text_field = new Textfield();
506 contents->AddChildView(text_field); 506 contents->AddChildView(text_field);
507 text_field->SetBounds(10, 50, 100, 20); 507 text_field->SetBounds(10, 50, 100, 20);
508 text_field->set_id(kStyleTextEditID); 508 text_field->set_id(kStyleTextEditID);
509 509
510 style_tab_ = new TabbedPane(false); 510 style_tab_ = new TabbedPane();
511 style_tab_->set_id(kStyleContainerID); 511 style_tab_->set_id(kStyleContainerID);
512 GetContentsView()->AddChildView(style_tab_); 512 GetContentsView()->AddChildView(style_tab_);
513 style_tab_->SetBounds(10, y, 210, 100); 513 style_tab_->SetBounds(10, y, 210, 100);
514 style_tab_->AddTab(ASCIIToUTF16("Style"), contents); 514 style_tab_->AddTab(ASCIIToUTF16("Style"), contents);
515 style_tab_->AddTab(ASCIIToUTF16("Other"), new View()); 515 style_tab_->AddTab(ASCIIToUTF16("Other"), new View());
516 516
517 // Right bottom box with search. 517 // Right bottom box with search.
518 contents = new View(); 518 contents = new View();
519 contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE)); 519 contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
520 text_field = new Textfield(); 520 text_field = new Textfield();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 GetFocusManager()->AdvanceFocus(true); 780 GetFocusManager()->AdvanceFocus(true);
781 View* focused_view = GetFocusManager()->GetFocusedView(); 781 View* focused_view = GetFocusManager()->GetFocusedView();
782 EXPECT_TRUE(focused_view != NULL); 782 EXPECT_TRUE(focused_view != NULL);
783 if (focused_view) 783 if (focused_view)
784 EXPECT_EQ(kRightTraversalIDs[j], focused_view->id()); 784 EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
785 } 785 }
786 } 786 }
787 } 787 }
788 788
789 } // namespace views 789 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698