| 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 "ui/views/view.h" | 5 #include "ui/views/view.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "ui/gfx/path.h" | 34 #include "ui/gfx/path.h" |
| 35 #include "ui/gfx/transform.h" | 35 #include "ui/gfx/transform.h" |
| 36 #include "ui/native_theme/native_theme.h" | 36 #include "ui/native_theme/native_theme.h" |
| 37 #include "ui/strings/grit/ui_strings.h" | 37 #include "ui/strings/grit/ui_strings.h" |
| 38 #include "ui/views/background.h" | 38 #include "ui/views/background.h" |
| 39 #include "ui/views/controls/native/native_view_host.h" | 39 #include "ui/views/controls/native/native_view_host.h" |
| 40 #include "ui/views/controls/scroll_view.h" | 40 #include "ui/views/controls/scroll_view.h" |
| 41 #include "ui/views/controls/textfield/textfield.h" | 41 #include "ui/views/controls/textfield/textfield.h" |
| 42 #include "ui/views/focus/view_storage.h" | 42 #include "ui/views/focus/view_storage.h" |
| 43 #include "ui/views/test/views_test_base.h" | 43 #include "ui/views/test/views_test_base.h" |
| 44 #include "ui/views/view_observer.h" |
| 44 #include "ui/views/widget/native_widget.h" | 45 #include "ui/views/widget/native_widget.h" |
| 45 #include "ui/views/widget/root_view.h" | 46 #include "ui/views/widget/root_view.h" |
| 46 #include "ui/views/window/dialog_client_view.h" | 47 #include "ui/views/window/dialog_client_view.h" |
| 47 #include "ui/views/window/dialog_delegate.h" | 48 #include "ui/views/window/dialog_delegate.h" |
| 48 | 49 |
| 49 using base::ASCIIToUTF16; | 50 using base::ASCIIToUTF16; |
| 50 | 51 |
| 51 namespace { | 52 namespace { |
| 52 | 53 |
| 53 // Returns true if |ancestor| is an ancestor of |layer|. | 54 // Returns true if |ancestor| is an ancestor of |layer|. |
| (...skipping 4516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4570 params.bounds = gfx::Rect(50, 50, 350, 350); | 4571 params.bounds = gfx::Rect(50, 50, 350, 350); |
| 4571 widget.Init(params); | 4572 widget.Init(params); |
| 4572 | 4573 |
| 4573 AddViewWithChildLayer(widget.GetRootView()); | 4574 AddViewWithChildLayer(widget.GetRootView()); |
| 4574 ViewThatAddsViewInOnNativeThemeChanged* v = | 4575 ViewThatAddsViewInOnNativeThemeChanged* v = |
| 4575 new ViewThatAddsViewInOnNativeThemeChanged; | 4576 new ViewThatAddsViewInOnNativeThemeChanged; |
| 4576 widget.GetRootView()->AddChildView(v); | 4577 widget.GetRootView()->AddChildView(v); |
| 4577 EXPECT_TRUE(v->on_native_theme_changed_called()); | 4578 EXPECT_TRUE(v->on_native_theme_changed_called()); |
| 4578 } | 4579 } |
| 4579 | 4580 |
| 4581 //////////////////////////////////////////////////////////////////////////////// |
| 4582 // Observer tests. |
| 4583 //////////////////////////////////////////////////////////////////////////////// |
| 4584 |
| 4585 class ViewObserverTest : public ViewTest, public ViewObserver { |
| 4586 public: |
| 4587 ViewObserverTest() |
| 4588 : view_visibility_changed_(nullptr), |
| 4589 view_enabled_changed_(nullptr), |
| 4590 view_bounds_changed_(nullptr), |
| 4591 view_reordered_(nullptr) {} |
| 4592 |
| 4593 ~ViewObserverTest() override {} |
| 4594 |
| 4595 // ViewObserver: |
| 4596 void OnViewParentChanged(View* target, View* old_parent) override { |
| 4597 ViewParentChangedDetails details; |
| 4598 details.target = target; |
| 4599 details.old_parent = old_parent; |
| 4600 details.new_parent = target->parent(); |
| 4601 views_parent_changed_details_.push_back(details); |
| 4602 } |
| 4603 |
| 4604 void OnViewVisibilityChanged(View* view) override { |
| 4605 view_visibility_changed_ = view; |
| 4606 } |
| 4607 |
| 4608 void OnViewEnabledChanged(View* view) override { |
| 4609 view_enabled_changed_ = view; |
| 4610 } |
| 4611 |
| 4612 void OnViewBoundsChanged(View* view) override { view_bounds_changed_ = view; } |
| 4613 |
| 4614 void OnChildViewReordered(View* view) override { view_reordered_ = view; } |
| 4615 |
| 4616 bool DidChangeParent(View* target, View* old_parent, View* new_parent) { |
| 4617 for (auto& details : views_parent_changed_details_) { |
| 4618 if (details.target == target && details.old_parent == old_parent && |
| 4619 details.new_parent == new_parent) |
| 4620 return true; |
| 4621 } |
| 4622 return false; |
| 4623 } |
| 4624 |
| 4625 void reset() { |
| 4626 views_parent_changed_details_.clear(); |
| 4627 view_visibility_changed_ = nullptr; |
| 4628 view_enabled_changed_ = nullptr; |
| 4629 view_bounds_changed_ = nullptr; |
| 4630 view_reordered_ = nullptr; |
| 4631 } |
| 4632 |
| 4633 std::unique_ptr<View> NewView() { |
| 4634 auto view = base::MakeUnique<View>(); |
| 4635 view->AddObserver(this); |
| 4636 return view; |
| 4637 } |
| 4638 |
| 4639 int views_parent_changed_times() const { |
| 4640 return static_cast<int>(views_parent_changed_details_.size()); |
| 4641 } |
| 4642 const View* view_visibility_changed() const { |
| 4643 return view_visibility_changed_; |
| 4644 } |
| 4645 const View* view_enabled_changed() const { return view_enabled_changed_; } |
| 4646 const View* view_bounds_changed() const { return view_bounds_changed_; } |
| 4647 const View* view_reordered() const { return view_reordered_; } |
| 4648 |
| 4649 private: |
| 4650 struct ViewParentChangedDetails { |
| 4651 View* target; |
| 4652 View* old_parent; |
| 4653 View* new_parent; |
| 4654 }; |
| 4655 std::vector<ViewParentChangedDetails> views_parent_changed_details_; |
| 4656 View* view_visibility_changed_; |
| 4657 View* view_enabled_changed_; |
| 4658 View* view_bounds_changed_; |
| 4659 View* view_reordered_; |
| 4660 |
| 4661 DISALLOW_COPY_AND_ASSIGN(ViewObserverTest); |
| 4662 }; |
| 4663 |
| 4664 TEST_F(ViewObserverTest, ViewParentChanged) { |
| 4665 std::unique_ptr<View> parent1 = NewView(); |
| 4666 std::unique_ptr<View> parent2 = NewView(); |
| 4667 std::unique_ptr<View> child_view = NewView(); |
| 4668 |
| 4669 parent1->AddChildView(child_view.get()); |
| 4670 EXPECT_EQ(1, views_parent_changed_times()); |
| 4671 EXPECT_TRUE(DidChangeParent(child_view.get(), nullptr, parent1.get())); |
| 4672 reset(); |
| 4673 |
| 4674 // Removed from parent1, added to parent2 |
| 4675 parent2->AddChildView(child_view.get()); |
| 4676 EXPECT_EQ(2, views_parent_changed_times()); |
| 4677 EXPECT_TRUE(DidChangeParent(child_view.get(), parent1.get(), nullptr)); |
| 4678 EXPECT_TRUE(DidChangeParent(child_view.get(), nullptr, parent2.get())); |
| 4679 |
| 4680 reset(); |
| 4681 |
| 4682 parent2->RemoveChildView(child_view.get()); |
| 4683 EXPECT_EQ(1, views_parent_changed_times()); |
| 4684 EXPECT_TRUE(DidChangeParent(child_view.get(), parent2.get(), nullptr)); |
| 4685 } |
| 4686 |
| 4687 TEST_F(ViewObserverTest, ViewVisibilityChanged) { |
| 4688 std::unique_ptr<View> view = NewView(); |
| 4689 view->SetVisible(false); |
| 4690 EXPECT_EQ(view.get(), view_visibility_changed()); |
| 4691 EXPECT_EQ(false, view->visible()); |
| 4692 } |
| 4693 |
| 4694 TEST_F(ViewObserverTest, ViewEnabledChanged) { |
| 4695 std::unique_ptr<View> view = NewView(); |
| 4696 view->SetEnabled(false); |
| 4697 EXPECT_EQ(view.get(), view_enabled_changed()); |
| 4698 EXPECT_EQ(false, view->enabled()); |
| 4699 } |
| 4700 |
| 4701 TEST_F(ViewObserverTest, ViewBoundsChanged) { |
| 4702 std::unique_ptr<View> view = NewView(); |
| 4703 gfx::Rect bounds(2, 2, 2, 2); |
| 4704 view->SetBoundsRect(bounds); |
| 4705 EXPECT_EQ(view.get(), view_bounds_changed()); |
| 4706 EXPECT_EQ(bounds, view->bounds()); |
| 4707 |
| 4708 reset(); |
| 4709 |
| 4710 gfx::Rect new_bounds(1, 1, 1, 1); |
| 4711 view->SetBoundsRect(new_bounds); |
| 4712 EXPECT_EQ(view.get(), view_bounds_changed()); |
| 4713 EXPECT_EQ(new_bounds, view->bounds()); |
| 4714 } |
| 4715 |
| 4716 TEST_F(ViewObserverTest, ChildViewReordered) { |
| 4717 std::unique_ptr<View> view = NewView(); |
| 4718 std::unique_ptr<View> child_view = NewView(); |
| 4719 std::unique_ptr<View> child_view2 = NewView(); |
| 4720 view->AddChildView(child_view.get()); |
| 4721 view->AddChildView(child_view2.get()); |
| 4722 view->ReorderChildView(child_view2.get(), 0); |
| 4723 EXPECT_EQ(child_view2.get(), view_reordered()); |
| 4724 } |
| 4725 |
| 4580 } // namespace views | 4726 } // namespace views |
| OLD | NEW |