| 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 #include "content/browser/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 void WebContentsViewAura::OnOverscrollComplete(OverscrollMode mode) { | 1048 void WebContentsViewAura::OnOverscrollComplete(OverscrollMode mode) { |
| 1049 if (web_contents_->GetDelegate() && | 1049 if (web_contents_->GetDelegate() && |
| 1050 IsScrollEndEffectEnabled() && | 1050 IsScrollEndEffectEnabled() && |
| 1051 (mode == OVERSCROLL_NORTH || mode == OVERSCROLL_SOUTH)) { | 1051 (mode == OVERSCROLL_NORTH || mode == OVERSCROLL_SOUTH)) { |
| 1052 web_contents_->GetDelegate()->OverscrollComplete(); | 1052 web_contents_->GetDelegate()->OverscrollComplete(); |
| 1053 } | 1053 } |
| 1054 CompleteOverscrollNavigation(mode); | 1054 CompleteOverscrollNavigation(mode); |
| 1055 } | 1055 } |
| 1056 | 1056 |
| 1057 void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode, | 1057 void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode, |
| 1058 OverscrollMode new_mode) { | 1058 OverscrollMode new_mode, |
| 1059 OverscrollSource source) { |
| 1059 if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH) | 1060 if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH) |
| 1060 OverscrollUpdateForWebContentsDelegate(0); | 1061 OverscrollUpdateForWebContentsDelegate(0); |
| 1061 | 1062 |
| 1062 current_overscroll_gesture_ = new_mode; | 1063 current_overscroll_gesture_ = new_mode; |
| 1063 navigation_overlay_->relay_delegate()->OnOverscrollModeChange(old_mode, | 1064 navigation_overlay_->relay_delegate()->OnOverscrollModeChange( |
| 1064 new_mode); | 1065 old_mode, new_mode, source); |
| 1065 completed_overscroll_gesture_ = OVERSCROLL_NONE; | 1066 completed_overscroll_gesture_ = OVERSCROLL_NONE; |
| 1066 } | 1067 } |
| 1067 | 1068 |
| 1068 //////////////////////////////////////////////////////////////////////////////// | 1069 //////////////////////////////////////////////////////////////////////////////// |
| 1069 // WebContentsViewAura, aura::WindowDelegate implementation: | 1070 // WebContentsViewAura, aura::WindowDelegate implementation: |
| 1070 | 1071 |
| 1071 gfx::Size WebContentsViewAura::GetMinimumSize() const { | 1072 gfx::Size WebContentsViewAura::GetMinimumSize() const { |
| 1072 return gfx::Size(); | 1073 return gfx::Size(); |
| 1073 } | 1074 } |
| 1074 | 1075 |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1337 bool allow_multiple_selection) { | 1338 bool allow_multiple_selection) { |
| 1338 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1339 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
| 1339 } | 1340 } |
| 1340 | 1341 |
| 1341 void WebContentsViewAura::HidePopupMenu() { | 1342 void WebContentsViewAura::HidePopupMenu() { |
| 1342 NOTIMPLEMENTED(); | 1343 NOTIMPLEMENTED(); |
| 1343 } | 1344 } |
| 1344 #endif | 1345 #endif |
| 1345 | 1346 |
| 1346 } // namespace content | 1347 } // namespace content |
| OLD | NEW |