| 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 <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 bool allow_multiple_selection) override; | 148 bool allow_multiple_selection) override; |
| 149 | 149 |
| 150 void HidePopupMenu() override; | 150 void HidePopupMenu() override; |
| 151 #endif | 151 #endif |
| 152 | 152 |
| 153 // Overridden from OverscrollControllerDelegate: | 153 // Overridden from OverscrollControllerDelegate: |
| 154 gfx::Rect GetVisibleBounds() const override; | 154 gfx::Rect GetVisibleBounds() const override; |
| 155 bool OnOverscrollUpdate(float delta_x, float delta_y) override; | 155 bool OnOverscrollUpdate(float delta_x, float delta_y) override; |
| 156 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; | 156 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; |
| 157 void OnOverscrollModeChange(OverscrollMode old_mode, | 157 void OnOverscrollModeChange(OverscrollMode old_mode, |
| 158 OverscrollMode new_mode) override; | 158 OverscrollMode new_mode, |
| 159 OverscrollSource source) override; |
| 159 | 160 |
| 160 // Overridden from aura::WindowDelegate: | 161 // Overridden from aura::WindowDelegate: |
| 161 gfx::Size GetMinimumSize() const override; | 162 gfx::Size GetMinimumSize() const override; |
| 162 gfx::Size GetMaximumSize() const override; | 163 gfx::Size GetMaximumSize() const override; |
| 163 void OnBoundsChanged(const gfx::Rect& old_bounds, | 164 void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 164 const gfx::Rect& new_bounds) override; | 165 const gfx::Rect& new_bounds) override; |
| 165 gfx::NativeCursor GetCursor(const gfx::Point& point) override; | 166 gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
| 166 int GetNonClientComponent(const gfx::Point& point) const override; | 167 int GetNonClientComponent(const gfx::Point& point) const override; |
| 167 bool ShouldDescendIntoChildForEventHandling( | 168 bool ShouldDescendIntoChildForEventHandling( |
| 168 aura::Window* child, | 169 aura::Window* child, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; | 245 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; |
| 245 | 246 |
| 246 bool init_rwhv_with_null_parent_for_testing_; | 247 bool init_rwhv_with_null_parent_for_testing_; |
| 247 | 248 |
| 248 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 249 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 249 }; | 250 }; |
| 250 | 251 |
| 251 } // namespace content | 252 } // namespace content |
| 252 | 253 |
| 253 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 254 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |