diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 05:21:45 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 05:21:45 +0000 |
| commit | c8ef812b276f624eacacd05d5b239bfe1ed5f696 (patch) | |
| tree | 5c9698d2b62f366c9d87ffae0227a10c22c1a3dd /views | |
| parent | 5af24f3796e9f18f286c8bee1cb1781daed31282 (diff) | |
| download | chromium_src-c8ef812b276f624eacacd05d5b239bfe1ed5f696.zip chromium_src-c8ef812b276f624eacacd05d5b239bfe1ed5f696.tar.gz chromium_src-c8ef812b276f624eacacd05d5b239bfe1ed5f696.tar.bz2 | |
touch: Fix compile (regressed in r80024).
TBR=saintlou@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 4 | ||||
| -rw-r--r-- | views/view_unittest.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index 1f54a13..75d3b72 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -868,7 +868,11 @@ class TestNativeButton : public NativeButton { : NativeButton(NULL, text) { }; virtual gfx::NativeView TestGetNativeControlView() { +#if defined(TOUCH_UI) + return GetWidget()->GetNativeView(); +#else return native_wrapper_->GetTestingHandle(); +#endif } }; diff --git a/views/view_unittest.cc b/views/view_unittest.cc index e09524b..4e7e9e3 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1389,8 +1389,8 @@ class DefaultButtonTest : public ViewTest { views::FocusManager* focus_manager_; TestDialog* test_dialog_; DialogClientView* client_view_; - views::NativeButtonBase* ok_button_; - views::NativeButtonBase* cancel_button_; + views::NativeButton* ok_button_; + views::NativeButton* cancel_button_; }; TEST_F(DefaultButtonTest, DialogDefaultButtonTest) { |