| OLD | NEW |
| 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/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "ui/base/models/combobox_model.h" | 9 #include "ui/base/models/combobox_model.h" |
| 10 #include "ui/views/controls/button/checkbox.h" | 10 #include "ui/views/controls/button/checkbox.h" |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 link = new Link(ASCIIToUTF16("Help")); | 509 link = new Link(ASCIIToUTF16("Help")); |
| 510 contents->AddChildView(link); | 510 contents->AddChildView(link); |
| 511 link->SetBounds(10, 35, 70, 10); | 511 link->SetBounds(10, 35, 70, 10); |
| 512 link->set_id(kStyleHelpLinkID); | 512 link->set_id(kStyleHelpLinkID); |
| 513 | 513 |
| 514 text_field = new Textfield(); | 514 text_field = new Textfield(); |
| 515 contents->AddChildView(text_field); | 515 contents->AddChildView(text_field); |
| 516 text_field->SetBounds(10, 50, 100, 20); | 516 text_field->SetBounds(10, 50, 100, 20); |
| 517 text_field->set_id(kStyleTextEditID); | 517 text_field->set_id(kStyleTextEditID); |
| 518 | 518 |
| 519 style_tab_ = new TabbedPane(); | 519 style_tab_ = new TabbedPane(false); |
| 520 style_tab_->set_id(kStyleContainerID); | 520 style_tab_->set_id(kStyleContainerID); |
| 521 GetContentsView()->AddChildView(style_tab_); | 521 GetContentsView()->AddChildView(style_tab_); |
| 522 style_tab_->SetBounds(10, y, 210, 100); | 522 style_tab_->SetBounds(10, y, 210, 100); |
| 523 style_tab_->AddTab(ASCIIToUTF16("Style"), contents); | 523 style_tab_->AddTab(ASCIIToUTF16("Style"), contents); |
| 524 style_tab_->AddTab(ASCIIToUTF16("Other"), new View()); | 524 style_tab_->AddTab(ASCIIToUTF16("Other"), new View()); |
| 525 #endif | 525 #endif |
| 526 | 526 |
| 527 // Right bottom box with search. | 527 // Right bottom box with search. |
| 528 contents = new View(); | 528 contents = new View(); |
| 529 contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE)); | 529 contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE)); |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 GetFocusManager()->AdvanceFocus(true); | 801 GetFocusManager()->AdvanceFocus(true); |
| 802 View* focused_view = GetFocusManager()->GetFocusedView(); | 802 View* focused_view = GetFocusManager()->GetFocusedView(); |
| 803 EXPECT_TRUE(focused_view != NULL); | 803 EXPECT_TRUE(focused_view != NULL); |
| 804 if (focused_view) | 804 if (focused_view) |
| 805 EXPECT_EQ(kRightTraversalIDs[j], focused_view->id()); | 805 EXPECT_EQ(kRightTraversalIDs[j], focused_view->id()); |
| 806 } | 806 } |
| 807 } | 807 } |
| 808 } | 808 } |
| 809 | 809 |
| 810 } // namespace views | 810 } // namespace views |
| OLD | NEW |