Commit 5c78dc2f authored by Manu Cornet's avatar Manu Cornet Committed by Commit Bot

CrOS Status area: Address some leftover comments

Change-Id: Icd18465789966a8f00c4ad1884eafd84c5a4c5ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144213Reviewed-by: default avatarTetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758208}
parent e179929c
......@@ -424,11 +424,13 @@ void StatusAreaWidget::AddTrayButton(TrayBackgroundView* tray_button) {
}
StatusAreaWidget::LayoutInputs StatusAreaWidget::GetLayoutInputs() const {
long child_visibility_bitmask = 0;
unsigned int child_visibility_bitmask = 0;
DCHECK(tray_buttons_.size() <
std::numeric_limits<decltype(child_visibility_bitmask)>::digits);
for (unsigned int i = 0; i < tray_buttons_.size(); ++i)
child_visibility_bitmask |= (tray_buttons_[i]->GetVisible() ? 1 : 0) << i;
for (unsigned int i = 0; i < tray_buttons_.size(); ++i) {
if (tray_buttons_[i]->GetVisible())
child_visibility_bitmask |= 1 << i;
}
return {target_bounds_, CalculateCollapseState(),
shelf_->shelf_layout_manager()->GetOpacity(),
child_visibility_bitmask};
......
......@@ -138,7 +138,7 @@ class ASH_EXPORT StatusAreaWidget : public SessionObserver,
CollapseState collapse_state = CollapseState::NOT_COLLAPSIBLE;
float opacity = 0.0f;
// Each bit keep track of one child's visibility.
long child_visibility_bitmask = 0;
unsigned int child_visibility_bitmask = 0;
bool operator==(const LayoutInputs& other) const {
return bounds == other.bounds && collapse_state == other.collapse_state &&
......
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