| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WEB_CONTENTS_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 virtual void StartDragging(const DropData& drop_data, | 138 virtual void StartDragging(const DropData& drop_data, |
| 139 WebKit::WebDragOperationsMask operations, | 139 WebKit::WebDragOperationsMask operations, |
| 140 const gfx::ImageSkia& image, | 140 const gfx::ImageSkia& image, |
| 141 const gfx::Vector2d& image_offset, | 141 const gfx::Vector2d& image_offset, |
| 142 const DragEventSourceInfo& event_info) OVERRIDE; | 142 const DragEventSourceInfo& event_info) OVERRIDE; |
| 143 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; | 143 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; |
| 144 virtual void GotFocus() OVERRIDE; | 144 virtual void GotFocus() OVERRIDE; |
| 145 virtual void TakeFocus(bool reverse) OVERRIDE; | 145 virtual void TakeFocus(bool reverse) OVERRIDE; |
| 146 | 146 |
| 147 // Overridden from OverscrollControllerDelegate: | 147 // Overridden from OverscrollControllerDelegate: |
| 148 virtual gfx::Rect GetVisibleBounds() const OVERRIDE; |
| 148 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; | 149 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; |
| 149 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; | 150 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; |
| 150 virtual void OnOverscrollModeChange(OverscrollMode old_mode, | 151 virtual void OnOverscrollModeChange(OverscrollMode old_mode, |
| 151 OverscrollMode new_mode) OVERRIDE; | 152 OverscrollMode new_mode) OVERRIDE; |
| 152 | 153 |
| 153 // Overridden from ui::ImplicitAnimationObserver: | 154 // Overridden from ui::ImplicitAnimationObserver: |
| 154 virtual void OnImplicitAnimationsCompleted() OVERRIDE; | 155 virtual void OnImplicitAnimationsCompleted() OVERRIDE; |
| 155 | 156 |
| 156 // Overridden from aura::WindowDelegate: | 157 // Overridden from aura::WindowDelegate: |
| 157 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 158 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_; | 230 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_; |
| 230 | 231 |
| 231 scoped_ptr<TouchEditableImplAura> touch_editable_; | 232 scoped_ptr<TouchEditableImplAura> touch_editable_; |
| 232 | 233 |
| 233 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 234 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 234 }; | 235 }; |
| 235 | 236 |
| 236 } // namespace content | 237 } // namespace content |
| 237 | 238 |
| 238 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |