diff options
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | views/focus/focus_manager_unittest.cc | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 60864b6..af32d9f 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -5115,6 +5115,11 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="linux" and (toolkit_views==1 or chromeos==1)', { + 'dependencies': [ + '../views/views.gyp:views', + ], + }], ['OS=="mac"', { # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. 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_); } |