| Index: ash/wm/panels/panel_frame_view.cc
|
| diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
|
| index 176547b79bde33b876b115f7435428280ddf0613..bce53c7f0c984233d78caac569c0d162505212d8 100644
|
| --- a/ash/wm/panels/panel_frame_view.cc
|
| +++ b/ash/wm/panels/panel_frame_view.cc
|
| @@ -59,7 +59,7 @@ void PanelFrameView::InitFramePainter() {
|
| }
|
|
|
| void PanelFrameView::Layout() {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return;
|
| frame_painter_->LayoutHeader(this, true);
|
| }
|
| @@ -80,7 +80,7 @@ void PanelFrameView::UpdateWindowIcon() {
|
| }
|
|
|
| void PanelFrameView::UpdateWindowTitle() {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return;
|
| frame_painter_->SchedulePaintForTitle(this, title_font_);
|
| }
|
| @@ -90,13 +90,13 @@ void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
|
| }
|
|
|
| int PanelFrameView::NonClientHitTest(const gfx::Point& point) {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return HTNOWHERE;
|
| return frame_painter_->NonClientHitTest(this, point);
|
| }
|
|
|
| void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return;
|
| bool paint_as_active = ShouldPaintAsActive();
|
| int theme_image_id = paint_as_active ? IDR_AURA_WINDOW_HEADER_BASE_ACTIVE :
|
| @@ -112,7 +112,7 @@ void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
|
| }
|
|
|
| gfx::Rect PanelFrameView::GetBoundsForClientView() const {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return bounds();
|
| return frame_painter_->GetBoundsForClientView(
|
| close_button_->bounds().bottom(),
|
| @@ -121,7 +121,7 @@ gfx::Rect PanelFrameView::GetBoundsForClientView() const {
|
|
|
| gfx::Rect PanelFrameView::GetWindowBoundsForClientBounds(
|
| const gfx::Rect& client_bounds) const {
|
| - if (!frame_painter_.get())
|
| + if (!frame_painter_)
|
| return client_bounds;
|
| return frame_painter_->GetWindowBoundsForClientBounds(
|
| close_button_->bounds().bottom(), client_bounds);
|
|
|