Commit 68272594 authored by Jennifer Apacible's avatar Jennifer Apacible Committed by Commit Bot

[OverlayWindowViews] Consistent function ordering.

Change-Id: I423a716e3716a552927676c3bc212141a10b6d20
Reviewed-on: https://chromium-review.googlesource.com/1247229Reviewed-by: default avatarCJ DiMeglio <lethalantidote@chromium.org>
Commit-Queue: apacible <apacible@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594786}
parent a6f3599a
...@@ -572,42 +572,10 @@ ui::Layer* OverlayWindowViews::GetVideoLayer() { ...@@ -572,42 +572,10 @@ ui::Layer* OverlayWindowViews::GetVideoLayer() {
return video_view_->layer(); return video_view_->layer();
} }
ui::Layer* OverlayWindowViews::GetControlsScrimLayer() {
return controls_scrim_view_->layer();
}
ui::Layer* OverlayWindowViews::GetCloseControlsLayer() {
return close_controls_view_->layer();
}
ui::Layer* OverlayWindowViews::GetControlsParentLayer() {
return controls_parent_view_->layer();
}
gfx::Rect OverlayWindowViews::GetVideoBounds() { gfx::Rect OverlayWindowViews::GetVideoBounds() {
return video_bounds_; return video_bounds_;
} }
gfx::Rect OverlayWindowViews::GetCloseControlsBounds() {
return close_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetPlayPauseControlsBounds() {
return play_pause_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetFirstCustomControlsBounds() {
if (!first_custom_controls_view_)
return gfx::Rect();
return first_custom_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetSecondCustomControlsBounds() {
if (!second_custom_controls_view_)
return gfx::Rect();
return second_custom_controls_view_->GetMirroredBounds();
}
void OverlayWindowViews::OnNativeBlur() { void OverlayWindowViews::OnNativeBlur() {
// Controls should be hidden when there is no more focus on the window. This // Controls should be hidden when there is no more focus on the window. This
// is used for tabbing and touch interactions. For mouse interactions, the // is used for tabbing and touch interactions. For mouse interactions, the
...@@ -771,6 +739,38 @@ void OverlayWindowViews::ButtonPressed(views::Button* sender, ...@@ -771,6 +739,38 @@ void OverlayWindowViews::ButtonPressed(views::Button* sender,
controller_->ClickCustomControl(second_custom_controls_view_->id()); controller_->ClickCustomControl(second_custom_controls_view_->id());
} }
gfx::Rect OverlayWindowViews::GetCloseControlsBounds() {
return close_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetPlayPauseControlsBounds() {
return play_pause_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetFirstCustomControlsBounds() {
if (!first_custom_controls_view_)
return gfx::Rect();
return first_custom_controls_view_->GetMirroredBounds();
}
gfx::Rect OverlayWindowViews::GetSecondCustomControlsBounds() {
if (!second_custom_controls_view_)
return gfx::Rect();
return second_custom_controls_view_->GetMirroredBounds();
}
ui::Layer* OverlayWindowViews::GetControlsScrimLayer() {
return controls_scrim_view_->layer();
}
ui::Layer* OverlayWindowViews::GetCloseControlsLayer() {
return close_controls_view_->layer();
}
ui::Layer* OverlayWindowViews::GetControlsParentLayer() {
return controls_parent_view_->layer();
}
void OverlayWindowViews::TogglePlayPause() { void OverlayWindowViews::TogglePlayPause() {
// Retrieve expected active state based on what command was sent in // Retrieve expected active state based on what command was sent in
// TogglePlayPause() since the IPC message may not have been propogated // TogglePlayPause() since the IPC message may not have been propogated
......
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