| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 // BorderView is a view containing a native window with its own view hierarchy. | 130 // BorderView is a view containing a native window with its own view hierarchy. |
| 131 // It is interesting to test focus traversal from a view hierarchy to an inner | 131 // It is interesting to test focus traversal from a view hierarchy to an inner |
| 132 // view hierarchy. | 132 // view hierarchy. |
| 133 class BorderView : public NativeViewHost { | 133 class BorderView : public NativeViewHost { |
| 134 public: | 134 public: |
| 135 explicit BorderView(View* child) : child_(child), widget_(NULL) { | 135 explicit BorderView(View* child) : child_(child), widget_(NULL) { |
| 136 DCHECK(child); | 136 DCHECK(child); |
| 137 SetFocusBehavior(FocusBehavior::NEVER); | 137 SetFocusBehavior(FocusBehavior::NEVER); |
| 138 } | 138 } |
| 139 | 139 |
| 140 ~BorderView() override {} | 140 ~BorderView() override { |
| 141 // TODO: ifdef should not be necessary. NativeWidgetMac has different |
| 142 // ownership semantics: http://crbug.com/663418. |
| 143 #if !defined(OS_MACOSX) |
| 144 if (widget_) |
| 145 widget_->CloseNow(); |
| 146 #endif |
| 147 } |
| 141 | 148 |
| 142 virtual internal::RootView* GetContentsRootView() { | 149 virtual internal::RootView* GetContentsRootView() { |
| 143 return static_cast<internal::RootView*>(widget_->GetRootView()); | 150 return static_cast<internal::RootView*>(widget_->GetRootView()); |
| 144 } | 151 } |
| 145 | 152 |
| 146 FocusTraversable* GetFocusTraversable() override { | 153 FocusTraversable* GetFocusTraversable() override { |
| 147 return static_cast<internal::RootView*>(widget_->GetRootView()); | 154 return static_cast<internal::RootView*>(widget_->GetRootView()); |
| 148 } | 155 } |
| 149 | 156 |
| 150 void ViewHierarchyChanged( | 157 void ViewHierarchyChanged( |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 GetFocusManager()->AdvanceFocus(false); | 886 GetFocusManager()->AdvanceFocus(false); |
| 880 EXPECT_FALSE(GetFocusManager()->GetFocusedView()); | 887 EXPECT_FALSE(GetFocusManager()->GetFocusedView()); |
| 881 | 888 |
| 882 // Advance backwards from the root node. | 889 // Advance backwards from the root node. |
| 883 GetFocusManager()->ClearFocus(); | 890 GetFocusManager()->ClearFocus(); |
| 884 GetFocusManager()->AdvanceFocus(true); | 891 GetFocusManager()->AdvanceFocus(true); |
| 885 EXPECT_FALSE(GetFocusManager()->GetFocusedView()); | 892 EXPECT_FALSE(GetFocusManager()->GetFocusedView()); |
| 886 } | 893 } |
| 887 | 894 |
| 888 } // namespace views | 895 } // namespace views |
| OLD | NEW |