diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
| commit | e3c3eae6043ae1c69b9a21c9584abcf467604aa1 (patch) | |
| tree | fb061f48e0fb4200d0a9cfd8ceeb47e24d3db884 /views/focus | |
| parent | eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13 (diff) | |
| download | chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.zip chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.gz chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.bz2 | |
Get views_unittests to compile (but not run).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7824021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc index aefd982..58d8bbc 100644 --- a/views/focus/focus_manager_unittest.cc +++ b/views/focus/focus_manager_unittest.cc @@ -132,7 +132,9 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { } void FocusNativeView(gfx::NativeView native_view) { -#if defined(OS_WIN) +#if defined(USE_AURA) + NOTIMPLEMENTED(); +#elif defined(OS_WIN) ::SendMessage(native_view, WM_SETFOCUS, NULL, NULL); #else gint return_val; @@ -170,7 +172,9 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { // Mocks activating/deactivating the window. void SimulateActivateWindow() { -#if defined(OS_WIN) +#if defined(USE_AURA) + NOTIMPLEMENTED(); +#elif defined(OS_WIN) ::SendMessage(window_->GetNativeWindow(), WM_ACTIVATE, WA_ACTIVE, NULL); #else gboolean result; @@ -179,7 +183,9 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { #endif } void SimulateDeactivateWindow() { -#if defined(OS_WIN) +#if defined(USE_AURA) + NOTIMPLEMENTED(); +#elif defined(OS_WIN) ::SendMessage(window_->GetNativeWindow(), WM_ACTIVATE, WA_INACTIVE, NULL); #else gboolean result; @@ -197,7 +203,15 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate { GetFocusManager()->AddFocusChangeListener(listener); } -#if defined(OS_WIN) +#if defined(USE_AURA) + void PostKeyDown(ui::KeyboardCode key_code) { + NOTIMPLEMENTED(); + } + + void PostKeyUp(ui::KeyboardCode key_code) { + NOTIMPLEMENTED(); + } +#elif defined(OS_WIN) void PostKeyDown(ui::KeyboardCode key_code) { ::PostMessage(window_->GetNativeWindow(), WM_KEYDOWN, key_code, 0); } @@ -1559,7 +1573,7 @@ TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) { } #endif -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) // Test that the focus manager is created successfully for the first view // window parented to a native dialog. TEST_F(FocusManagerTest, CreationForNativeRoot) { |