summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-22 01:29:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-22 01:29:15 +0000
commit841c523f75dd0fae0d178b84b1b9f438354dab20 (patch)
tree1cedd2ccaeb5c55b500f33a50c330f7f7021af41 /views
parenteefb825d985fe3b8a4c74b30a0509e5123649452 (diff)
downloadchromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.zip
chromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.tar.gz
chromium_src-841c523f75dd0fae0d178b84b1b9f438354dab20.tar.bz2
Try to fix the ChromeOS build. This tries to add a views dependency for browser_tests, and fixes some simple errors in the focus unit test.
Review URL: http://codereview.chromium.org/173243 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/focus/focus_manager_unittest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index c72a394..720e9f8 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -12,6 +12,7 @@
#include "app/resource_bundle.h"
#include "base/gfx/rect.h"
#include "base/keyboard_codes.h"
+#include "base/logging.h"
#include "base/string_util.h"
#include "third_party/skia/include/core/SkColor.h"
#include "views/background.h"
@@ -176,14 +177,14 @@ class FocusManagerTest : public testing::Test, public WindowDelegate {
#if defined(OS_WIN)
::SendMessage(window_->GetNativeWindow(), WM_ACTIVATE, WA_ACTIVE, NULL);
#else
- NOTDEFINED();
+ NOTIMPLEMENTED();
#endif
}
void SimulateDeactivateWindow() {
#if defined(OS_WIN)
::SendMessage(window_->GetNativeWindow(), WM_ACTIVATE, WA_INACTIVE, NULL);
#else
- NOTDEFINED();
+ NOTIMPLEMENTED();
#endif
}
@@ -237,7 +238,7 @@ class BorderView : public NativeViewHost {
widget_win->SetFocusTraversableParentView(this);
widget_ = widget_win;
#else
- widget_ = new WidgetGtk();
+ widget_ = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
#endif
widget_->SetContentsView(child_);
}