diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 22:01:10 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 22:01:10 +0000 |
| commit | 89d70652ad0bb9e7f419c17516fad279d8a4db32 (patch) | |
| tree | 6f7dd87b5d5d8360cfa4d5c488c59c200a05a408 /views/widget/root_view.cc | |
| parent | 6d480108b246d22f4a8e4d7895730526f814117e (diff) | |
| download | chromium_src-89d70652ad0bb9e7f419c17516fad279d8a4db32.zip chromium_src-89d70652ad0bb9e7f419c17516fad279d8a4db32.tar.gz chromium_src-89d70652ad0bb9e7f419c17516fad279d8a4db32.tar.bz2 | |
This makes the unit-tests pass with toolkit_views on Linux.
It also make them run the view tests.
BUG=None
TEST=Run the unit-tests on Linux with toolkit_views=1
Review URL: http://codereview.chromium.org/149649
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/root_view.cc')
| -rw-r--r-- | views/widget/root_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index b3d35a7..34de509 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -266,11 +266,8 @@ void RootView::ViewHierarchyChanged(bool is_add, View* parent, View* child) { // An unparanted RootView does not have a FocusManager. if (focus_manager) focus_manager->ViewRemoved(parent, child); -#if defined(OS_WIN) + ViewStorage::GetSharedInstance()->ViewRemoved(parent, child); -#else - NOTIMPLEMENTED(); -#endif } } @@ -943,7 +940,10 @@ void RootView::SetActiveCursor(gfx::NativeCursor cursor) { previous_cursor_ = NULL; } #elif defined(OS_LINUX) - gdk_window_set_cursor(GetWidget()->GetNativeView()->window, cursor); + gfx::NativeView native_view = GetWidget()->GetNativeView(); + if (!native_view) + return; + gdk_window_set_cursor(native_view->window, cursor); if (cursor) gdk_cursor_destroy(cursor); #endif |