Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Side by Side Diff: ash/frame/frame_border_hit_test_controller.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/frame/frame_border_hit_test_controller.h" 5 #include "ash/frame/frame_border_hit_test_controller.h"
6 6
oshima 2016/04/08 07:09:40 include?
7 #include "ash/ash_constants.h" 7 #include "ash/ash_constants.h"
8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" 8 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
9 #include "ash/wm/resize_handle_window_targeter.h" 9 #include "ash/wm/resize_handle_window_targeter.h"
10 #include "ash/wm/window_state_observer.h" 10 #include "ash/wm/window_state_observer.h"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/aura/window_observer.h" 13 #include "ui/aura/window_observer.h"
14 #include "ui/aura/window_targeter.h" 14 #include "ui/aura/window_targeter.h"
15 #include "ui/base/hit_test.h" 15 #include "ui/base/hit_test.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 #include "ui/views/widget/widget_delegate.h" 17 #include "ui/views/widget/widget_delegate.h"
18 #include "ui/views/window/non_client_view.h" 18 #include "ui/views/window/non_client_view.h"
19 19
20 namespace ash { 20 namespace ash {
21 21
22 FrameBorderHitTestController::FrameBorderHitTestController(views::Widget* frame) 22 FrameBorderHitTestController::FrameBorderHitTestController(views::Widget* frame)
23 : frame_window_(frame->GetNativeWindow()) { 23 : frame_window_(frame->GetNativeWindow()) {
24 frame_window_->SetEventTargeter(scoped_ptr<ui::EventTargeter>( 24 frame_window_->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
25 new ResizeHandleWindowTargeter(frame_window_, NULL))); 25 new ResizeHandleWindowTargeter(frame_window_, NULL)));
26 } 26 }
27 27
28 FrameBorderHitTestController::~FrameBorderHitTestController() { 28 FrameBorderHitTestController::~FrameBorderHitTestController() {
29 } 29 }
30 30
31 // static 31 // static
32 int FrameBorderHitTestController::NonClientHitTest( 32 int FrameBorderHitTestController::NonClientHitTest(
33 views::NonClientFrameView* view, 33 views::NonClientFrameView* view,
34 FrameCaptionButtonContainerView* caption_button_container, 34 FrameCaptionButtonContainerView* caption_button_container,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 point_in_caption_button_container); 76 point_in_caption_button_container);
77 if (caption_button_component != HTNOWHERE) 77 if (caption_button_component != HTNOWHERE)
78 return caption_button_component; 78 return caption_button_component;
79 } 79 }
80 80
81 // Caption is a safe default. 81 // Caption is a safe default.
82 return HTCAPTION; 82 return HTCAPTION;
83 } 83 }
84 84
85 } // namespace ash 85 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698