| 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 c06548e498ba513fe4dfcb0dcc2dbe0a297418fa..f78fc6cdd7b818a4460f7ede4ad8ac23c23e071e 100644
|
| --- a/ash/wm/panels/panel_frame_view.cc
|
| +++ b/ash/wm/panels/panel_frame_view.cc
|
| @@ -8,8 +8,9 @@
|
| #include "ash/common/frame/default_header_painter.h"
|
| #include "ash/common/frame/frame_border_hit_test.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| +#include "ash/common/wm_lookup.h"
|
| #include "ash/common/wm_shell.h"
|
| -#include "ash/frame/frame_border_hit_test_controller.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/base/hit_test.h"
|
| @@ -24,11 +25,9 @@ namespace ash {
|
| const char PanelFrameView::kViewClassName[] = "PanelFrameView";
|
|
|
| PanelFrameView::PanelFrameView(views::Widget* frame, FrameType frame_type)
|
| - : frame_(frame),
|
| - caption_button_container_(NULL),
|
| - window_icon_(NULL),
|
| - frame_border_hit_test_controller_(
|
| - new FrameBorderHitTestController(frame_)) {
|
| + : frame_(frame), caption_button_container_(nullptr), window_icon_(nullptr) {
|
| + WmLookup::Get()->GetWindowForWidget(frame)->InstallResizeHandleWindowTargeter(
|
| + nullptr);
|
| DCHECK(!frame_->widget_delegate()->CanMaximize());
|
| if (frame_type != FRAME_NONE)
|
| InitHeaderPainter();
|
|
|