Commit 8e4ca09a authored by Allen Bauer's avatar Allen Bauer Committed by Commit Bot

Refine a parameter type decl and add some DCHECKs.

Bug: 938501, 1130078
Change-Id: Ic47c7c789d907e5cdec877c4771100b3bd094d54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503822Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Reviewed-by: default avatarKeren Zhu <kerenzhu@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Auto-Submit: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821567}
parent 7ae365ea
...@@ -47,6 +47,7 @@ class BaseViewBuilderT : public internal::ViewBuilderCore { ...@@ -47,6 +47,7 @@ class BaseViewBuilderT : public internal::ViewBuilderCore {
} }
std::unique_ptr<ViewClass_> Build() { std::unique_ptr<ViewClass_> Build() {
DCHECK(!root_view_) << "Root view specified. Use BuildChildren() instead.";
DCHECK(view_); DCHECK(view_);
SetProperties(view_.get()); SetProperties(view_.get());
CreateChildren(view_.get()); CreateChildren(view_.get());
...@@ -54,6 +55,7 @@ class BaseViewBuilderT : public internal::ViewBuilderCore { ...@@ -54,6 +55,7 @@ class BaseViewBuilderT : public internal::ViewBuilderCore {
} }
void BuildChildren() { void BuildChildren() {
DCHECK(!view_) << "Default constructor called. Use Build() instead.";
DCHECK(root_view_); DCHECK(root_view_);
SetProperties(root_view_); SetProperties(root_view_);
CreateChildren(root_view_); CreateChildren(root_view_);
...@@ -70,7 +72,8 @@ class BaseViewBuilderT : public internal::ViewBuilderCore { ...@@ -70,7 +72,8 @@ class BaseViewBuilderT : public internal::ViewBuilderCore {
} }
template <typename T> template <typename T>
Builder& SetProperty(const ui::ClassProperty<T*>* property, const T& value) { Builder& SetProperty(const ui::ClassProperty<T*>* property,
metadata::ArgType<T> value) {
auto setter = auto setter =
std::make_unique<internal::ClassPropertyMoveSetter<ViewClass_, T>>( std::make_unique<internal::ClassPropertyMoveSetter<ViewClass_, T>>(
property, value); property, value);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment