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

Side by Side Diff: cc/input/top_controls_manager.h

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 #ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_ 5 #ifndef CC_INPUT_TOP_CONTROLS_MANAGER_H_
6 #define CC_INPUT_TOP_CONTROLS_MANAGER_H_ 6 #define CC_INPUT_TOP_CONTROLS_MANAGER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 26 matching lines...) Expand all
37 TopControlsManagerClient* client, 37 TopControlsManagerClient* client,
38 float top_controls_show_threshold, 38 float top_controls_show_threshold,
39 float top_controls_hide_threshold); 39 float top_controls_hide_threshold);
40 virtual ~TopControlsManager(); 40 virtual ~TopControlsManager();
41 41
42 float ControlsTopOffset() const; 42 float ControlsTopOffset() const;
43 float ContentTopOffset() const; 43 float ContentTopOffset() const;
44 float TopControlsShownRatio() const; 44 float TopControlsShownRatio() const;
45 float TopControlsHeight() const; 45 float TopControlsHeight() const;
46 46
47 bool has_animation() const { return top_controls_animation_; } 47 bool has_animation() const { return !!top_controls_animation_; }
48 AnimationDirection animation_direction() { return animation_direction_; } 48 AnimationDirection animation_direction() { return animation_direction_; }
49 49
50 void UpdateTopControlsState(TopControlsState constraints, 50 void UpdateTopControlsState(TopControlsState constraints,
51 TopControlsState current, 51 TopControlsState current,
52 bool animate); 52 bool animate);
53 53
54 void ScrollBegin(); 54 void ScrollBegin();
55 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& pending_delta); 55 gfx::Vector2dF ScrollBy(const gfx::Vector2dF& pending_delta);
56 void ScrollEnd(); 56 void ScrollEnd();
57 57
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 float top_controls_hide_threshold_; 98 float top_controls_hide_threshold_;
99 99
100 bool pinch_gesture_active_; 100 bool pinch_gesture_active_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(TopControlsManager); 102 DISALLOW_COPY_AND_ASSIGN(TopControlsManager);
103 }; 103 };
104 104
105 } // namespace cc 105 } // namespace cc
106 106
107 #endif // CC_INPUT_TOP_CONTROLS_MANAGER_H_ 107 #endif // CC_INPUT_TOP_CONTROLS_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698