| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 
| 7 | 7 | 
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 133 | 133 | 
| 134   // The accumulated amount of horizontal scroll. | 134   // The accumulated amount of horizontal scroll. | 
| 135   float delta_x_; | 135   float delta_x_; | 
| 136 | 136 | 
| 137   // This keeps track of the layer created by the delegate. | 137   // This keeps track of the layer created by the delegate. | 
| 138   scoped_ptr<ui::Layer> slider_; | 138   scoped_ptr<ui::Layer> slider_; | 
| 139 | 139 | 
| 140   // This manages the shadow for the layers. | 140   // This manages the shadow for the layers. | 
| 141   scoped_ptr<ShadowLayerDelegate> shadow_; | 141   scoped_ptr<ShadowLayerDelegate> shadow_; | 
| 142 | 142 | 
| 143   base::WeakPtrFactory<WindowSlider> weak_factory_; |  | 
| 144 |  | 
| 145   float active_start_threshold_; | 143   float active_start_threshold_; | 
| 146 | 144 | 
| 147   const float start_threshold_touchscreen_; | 145   const float start_threshold_touchscreen_; | 
| 148   const float start_threshold_touchpad_; | 146   const float start_threshold_touchpad_; | 
| 149   const float complete_threshold_; | 147   const float complete_threshold_; | 
| 150 | 148 | 
|  | 149   base::WeakPtrFactory<WindowSlider> weak_factory_; | 
|  | 150 | 
| 151   DISALLOW_COPY_AND_ASSIGN(WindowSlider); | 151   DISALLOW_COPY_AND_ASSIGN(WindowSlider); | 
| 152 }; | 152 }; | 
| 153 | 153 | 
| 154 }  // namespace content | 154 }  // namespace content | 
| 155 | 155 | 
| 156 #endif  // CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 156 #endif  // CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_ | 
| OLD | NEW | 
|---|