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

Side by Side Diff: content/browser/web_contents/aura/gesture_nav_simple.h

Issue 1874893002: Convert //content/browser 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "content/browser/renderer_host/overscroll_controller_delegate.h" 11 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
11 12
12 namespace gfx { 13 namespace gfx {
13 class Transform; 14 class Transform;
14 } 15 }
15 16
16 namespace ui { 17 namespace ui {
17 class Layer; 18 class Layer;
18 } 19 }
19 20
(...skipping 17 matching lines...) Expand all
37 38
38 // OverscrollControllerDelegate: 39 // OverscrollControllerDelegate:
39 gfx::Rect GetVisibleBounds() const override; 40 gfx::Rect GetVisibleBounds() const override;
40 // Returns true if the scroll update was consumed. 41 // Returns true if the scroll update was consumed.
41 bool OnOverscrollUpdate(float delta_x, float delta_y) override; 42 bool OnOverscrollUpdate(float delta_x, float delta_y) override;
42 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; 43 void OnOverscrollComplete(OverscrollMode overscroll_mode) override;
43 void OnOverscrollModeChange(OverscrollMode old_mode, 44 void OnOverscrollModeChange(OverscrollMode old_mode,
44 OverscrollMode new_mode) override; 45 OverscrollMode new_mode) override;
45 46
46 WebContentsImpl* web_contents_; 47 WebContentsImpl* web_contents_;
47 scoped_ptr<ui::Layer> clip_layer_; 48 std::unique_ptr<ui::Layer> clip_layer_;
48 scoped_ptr<ui::Layer> arrow_; 49 std::unique_ptr<ui::Layer> arrow_;
49 scoped_ptr<ArrowLayerDelegate> arrow_delegate_; 50 std::unique_ptr<ArrowLayerDelegate> arrow_delegate_;
50 float completion_threshold_; 51 float completion_threshold_;
51 52
52 DISALLOW_COPY_AND_ASSIGN(GestureNavSimple); 53 DISALLOW_COPY_AND_ASSIGN(GestureNavSimple);
53 }; 54 };
54 55
55 } // namespace content 56 } // namespace content
56 57
57 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_ 58 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_GESTURE_NAV_SIMPLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698