Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: ui/views/view_unittest.cc

Issue 2745163003: Improve doc of ViewObserver and clarify arguments (Closed)
Patch Set: moar Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/view_observer.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4860 matching lines...) Expand 10 before | Expand all | Expand 10 after
4871 child_view_removed_(nullptr), 4871 child_view_removed_(nullptr),
4872 child_view_removed_parent_(nullptr), 4872 child_view_removed_parent_(nullptr),
4873 view_visibility_changed_(nullptr), 4873 view_visibility_changed_(nullptr),
4874 view_enabled_changed_(nullptr), 4874 view_enabled_changed_(nullptr),
4875 view_bounds_changed_(nullptr), 4875 view_bounds_changed_(nullptr),
4876 view_reordered_(nullptr) {} 4876 view_reordered_(nullptr) {}
4877 4877
4878 ~ViewObserverTest() override {} 4878 ~ViewObserverTest() override {}
4879 4879
4880 // ViewObserver: 4880 // ViewObserver:
4881 void OnChildViewAdded(View* child) override { 4881 void OnChildViewAdded(View* parent, View* child) override {
Bret 2017/03/14 18:58:36 add a couple lines to the existing unit tests that
sky 2017/03/14 20:19:28 Done.
4882 child_view_added_times_++; 4882 child_view_added_times_++;
4883 child_view_added_ = child; 4883 child_view_added_ = child;
4884 } 4884 }
4885 void OnChildViewRemoved(View* child, View* parent) override { 4885 void OnChildViewRemoved(View* parent, View* child) override {
4886 child_view_removed_times_++; 4886 child_view_removed_times_++;
4887 child_view_removed_ = child; 4887 child_view_removed_ = child;
4888 child_view_removed_parent_ = parent; 4888 child_view_removed_parent_ = parent;
4889 } 4889 }
4890 4890
4891 void OnViewVisibilityChanged(View* view) override { 4891 void OnViewVisibilityChanged(View* view) override {
4892 view_visibility_changed_ = view; 4892 view_visibility_changed_ = view;
4893 } 4893 }
4894 4894
4895 void OnViewEnabledChanged(View* view) override { 4895 void OnViewEnabledChanged(View* view) override {
4896 view_enabled_changed_ = view; 4896 view_enabled_changed_ = view;
4897 } 4897 }
4898 4898
4899 void OnViewBoundsChanged(View* view) override { view_bounds_changed_ = view; } 4899 void OnViewBoundsChanged(View* view) override { view_bounds_changed_ = view; }
4900 4900
4901 void OnChildViewReordered(View* view) override { view_reordered_ = view; } 4901 void OnChildViewReordered(View* parent, View* view) override {
4902 view_reordered_ = view;
4903 }
4902 4904
4903 void reset() { 4905 void reset() {
4904 child_view_added_times_ = 0; 4906 child_view_added_times_ = 0;
4905 child_view_removed_times_ = 0; 4907 child_view_removed_times_ = 0;
4906 child_view_added_ = nullptr; 4908 child_view_added_ = nullptr;
4907 child_view_removed_ = nullptr; 4909 child_view_removed_ = nullptr;
4908 child_view_removed_parent_ = nullptr; 4910 child_view_removed_parent_ = nullptr;
4909 view_visibility_changed_ = nullptr; 4911 view_visibility_changed_ = nullptr;
4910 view_enabled_changed_ = nullptr; 4912 view_enabled_changed_ = nullptr;
4911 view_bounds_changed_ = nullptr; 4913 view_bounds_changed_ = nullptr;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
5010 std::unique_ptr<View> view = NewView(); 5012 std::unique_ptr<View> view = NewView();
5011 std::unique_ptr<View> child_view = NewView(); 5013 std::unique_ptr<View> child_view = NewView();
5012 std::unique_ptr<View> child_view2 = NewView(); 5014 std::unique_ptr<View> child_view2 = NewView();
5013 view->AddChildView(child_view.get()); 5015 view->AddChildView(child_view.get());
5014 view->AddChildView(child_view2.get()); 5016 view->AddChildView(child_view2.get());
5015 view->ReorderChildView(child_view2.get(), 0); 5017 view->ReorderChildView(child_view2.get(), 0);
5016 EXPECT_EQ(child_view2.get(), view_reordered()); 5018 EXPECT_EQ(child_view2.get(), view_reordered());
5017 } 5019 }
5018 5020
5019 } // namespace views 5021 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/view_observer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698