summaryrefslogtreecommitdiffstats
path: root/views/focus
diff options
context:
space:
mode:
authorrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 16:29:38 +0000
committerrogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 16:29:38 +0000
commit2752a49a7aa82d7375e97cde7c8a3d3af80a4047 (patch)
tree112a400ef11e4c1f02329c8cfb13758418f80c4c /views/focus
parent258ffc5314093be40b510db22239e0ace4bbb006 (diff)
downloadchromium_src-2752a49a7aa82d7375e97cde7c8a3d3af80a4047.zip
chromium_src-2752a49a7aa82d7375e97cde7c8a3d3af80a4047.tar.gz
chromium_src-2752a49a7aa82d7375e97cde7c8a3d3af80a4047.tar.bz2
Changing Checkbox class to use NativeTheme class for rendering instead of
native controls. The original Checkbox class is renamed to NativeCheckbox. BUG=None TEST=The affected locations are: chromeos EULA page, uninstall view, chromeos wifi config, and create application shortcut view. Should verify that checkboxes in these locations look and behave as they did before. Review URL: http://codereview.chromium.org/7082041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
-rw-r--r--views/focus/focus_manager_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index ddd74f1..c7b8c04 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -461,7 +461,7 @@ void FocusTraversalTest::InitContentView() {
content_view_->set_background(
Background::CreateSolidBackground(SK_ColorWHITE));
- Checkbox* cb = new Checkbox(L"This is a checkbox");
+ NativeCheckbox* cb = new NativeCheckbox(L"This is a checkbox");
content_view_->AddChildView(cb);
// In this fast paced world, who really has time for non hard-coded layout?
cb->SetBounds(10, 10, 200, 20);
@@ -540,7 +540,7 @@ void FocusTraversalTest::InitContentView() {
left_container_->AddChildView(button);
y += 40;
- cb = new Checkbox(L"This is another check box");
+ cb = new NativeCheckbox(L"This is another check box");
cb->SetBounds(label_x + label_width + 5, y, 180, 20);
cb->SetID(kFruitCheckBoxID);
left_container_->AddChildView(cb);
@@ -651,17 +651,17 @@ void FocusTraversalTest::InitContentView() {
// Left bottom box with style checkboxes.
View* contents = new View();
contents->set_background(Background::CreateSolidBackground(SK_ColorWHITE));
- cb = new Checkbox(L"Bold");
+ cb = new NativeCheckbox(L"Bold");
contents->AddChildView(cb);
cb->SetBounds(10, 10, 50, 20);
cb->SetID(kBoldCheckBoxID);
- cb = new Checkbox(L"Italic");
+ cb = new NativeCheckbox(L"Italic");
contents->AddChildView(cb);
cb->SetBounds(70, 10, 50, 20);
cb->SetID(kItalicCheckBoxID);
- cb = new Checkbox(L"Underlined");
+ cb = new NativeCheckbox(L"Underlined");
contents->AddChildView(cb);
cb->SetBounds(130, 10, 70, 20);
cb->SetID(kUnderlinedCheckBoxID);
@@ -865,9 +865,9 @@ class TestNativeButton : public NativeButton {
}
};
-class TestCheckbox : public Checkbox {
+class TestCheckbox : public NativeCheckbox {
public:
- explicit TestCheckbox(const std::wstring& text) : Checkbox(text) {
+ explicit TestCheckbox(const std::wstring& text) : NativeCheckbox(text) {
};
virtual gfx::NativeView TestGetNativeControlView() {
return native_wrapper_->GetTestingHandle();