Commit f18f41a5 authored by yongseok-choi's avatar yongseok-choi Committed by Commit Bot

Prefer unique_ptr to raw pointer to add child view.

Bug: 648382
Change-Id: I43525db40843528773cae2a675e6a28a244dc46d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1735228
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687673}
parent d0629110
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
namespace { namespace {
const int kCloseButtonMargin = 8; constexpr int kCloseButtonMargin = 8;
const int kCloseButtonSize = 16; constexpr int kCloseButtonSize = 16;
constexpr SkColor kCloseIconColor = SK_ColorWHITE; constexpr SkColor kCloseIconColor = SK_ColorWHITE;
......
...@@ -214,17 +214,17 @@ class OverlayWindowViews : public content::OverlayWindow, ...@@ -214,17 +214,17 @@ class OverlayWindowViews : public content::OverlayWindow,
gfx::Size natural_size_; gfx::Size natural_size_;
// Views to be shown. // Views to be shown.
std::unique_ptr<views::View> window_background_view_; views::View* window_background_view_ = nullptr;
std::unique_ptr<views::View> video_view_; views::View* video_view_ = nullptr;
std::unique_ptr<views::View> controls_scrim_view_; views::View* controls_scrim_view_ = nullptr;
std::unique_ptr<views::CloseImageButton> close_controls_view_; views::CloseImageButton* close_controls_view_ = nullptr;
std::unique_ptr<views::BackToTabImageButton> back_to_tab_controls_view_; views::BackToTabImageButton* back_to_tab_controls_view_ = nullptr;
std::unique_ptr<views::TrackImageButton> previous_track_controls_view_; views::TrackImageButton* previous_track_controls_view_ = nullptr;
std::unique_ptr<views::PlaybackImageButton> play_pause_controls_view_; views::PlaybackImageButton* play_pause_controls_view_ = nullptr;
std::unique_ptr<views::TrackImageButton> next_track_controls_view_; views::TrackImageButton* next_track_controls_view_ = nullptr;
std::unique_ptr<views::MuteImageButton> mute_controls_view_; views::MuteImageButton* mute_controls_view_ = nullptr;
std::unique_ptr<views::SkipAdLabelButton> skip_ad_controls_view_; views::SkipAdLabelButton* skip_ad_controls_view_ = nullptr;
std::unique_ptr<views::ResizeHandleButton> resize_handle_view_; views::ResizeHandleButton* resize_handle_view_ = nullptr;
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
std::unique_ptr<ash::RoundedCornerDecorator> decorator_; std::unique_ptr<ash::RoundedCornerDecorator> decorator_;
#endif #endif
......
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