| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 bool allow_multiple_selection) override; | 141 bool allow_multiple_selection) override; |
| 142 | 142 |
| 143 void HidePopupMenu() override; | 143 void HidePopupMenu() override; |
| 144 #endif | 144 #endif |
| 145 | 145 |
| 146 // Overridden from OverscrollControllerDelegate: | 146 // Overridden from OverscrollControllerDelegate: |
| 147 gfx::Rect GetVisibleBounds() const override; | 147 gfx::Rect GetVisibleBounds() const override; |
| 148 bool OnOverscrollUpdate(float delta_x, float delta_y) override; | 148 bool OnOverscrollUpdate(float delta_x, float delta_y) override; |
| 149 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; | 149 void OnOverscrollComplete(OverscrollMode overscroll_mode) override; |
| 150 void OnOverscrollModeChange(OverscrollMode old_mode, | 150 void OnOverscrollModeChange(OverscrollMode old_mode, |
| 151 OverscrollMode new_mode) override; | 151 OverscrollMode new_mode, |
| 152 OverscrollSource source) override; |
| 152 | 153 |
| 153 // Overridden from aura::WindowDelegate: | 154 // Overridden from aura::WindowDelegate: |
| 154 gfx::Size GetMinimumSize() const override; | 155 gfx::Size GetMinimumSize() const override; |
| 155 gfx::Size GetMaximumSize() const override; | 156 gfx::Size GetMaximumSize() const override; |
| 156 void OnBoundsChanged(const gfx::Rect& old_bounds, | 157 void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 157 const gfx::Rect& new_bounds) override; | 158 const gfx::Rect& new_bounds) override; |
| 158 gfx::NativeCursor GetCursor(const gfx::Point& point) override; | 159 gfx::NativeCursor GetCursor(const gfx::Point& point) override; |
| 159 int GetNonClientComponent(const gfx::Point& point) const override; | 160 int GetNonClientComponent(const gfx::Point& point) const override; |
| 160 bool ShouldDescendIntoChildForEventHandling( | 161 bool ShouldDescendIntoChildForEventHandling( |
| 161 aura::Window* child, | 162 aura::Window* child, |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; | 238 std::unique_ptr<GestureNavSimple> gesture_nav_simple_; |
| 238 | 239 |
| 239 bool init_rwhv_with_null_parent_for_testing_; | 240 bool init_rwhv_with_null_parent_for_testing_; |
| 240 | 241 |
| 241 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 242 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 242 }; | 243 }; |
| 243 | 244 |
| 244 } // namespace content | 245 } // namespace content |
| 245 | 246 |
| 246 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 247 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |