| 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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1035 void WebContentsViewAura::OnOverscrollComplete(OverscrollMode mode) { | 1035 void WebContentsViewAura::OnOverscrollComplete(OverscrollMode mode) { |
| 1036 if (web_contents_->GetDelegate() && | 1036 if (web_contents_->GetDelegate() && |
| 1037 IsScrollEndEffectEnabled() && | 1037 IsScrollEndEffectEnabled() && |
| 1038 (mode == OVERSCROLL_NORTH || mode == OVERSCROLL_SOUTH)) { | 1038 (mode == OVERSCROLL_NORTH || mode == OVERSCROLL_SOUTH)) { |
| 1039 web_contents_->GetDelegate()->OverscrollComplete(); | 1039 web_contents_->GetDelegate()->OverscrollComplete(); |
| 1040 } | 1040 } |
| 1041 CompleteOverscrollNavigation(mode); | 1041 CompleteOverscrollNavigation(mode); |
| 1042 } | 1042 } |
| 1043 | 1043 |
| 1044 void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode, | 1044 void WebContentsViewAura::OnOverscrollModeChange(OverscrollMode old_mode, |
| 1045 OverscrollMode new_mode) { | 1045 OverscrollMode new_mode, |
| 1046 OverscrollSource source) { |
| 1046 if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH) | 1047 if (old_mode == OVERSCROLL_NORTH || old_mode == OVERSCROLL_SOUTH) |
| 1047 OverscrollUpdateForWebContentsDelegate(0); | 1048 OverscrollUpdateForWebContentsDelegate(0); |
| 1048 | 1049 |
| 1049 current_overscroll_gesture_ = new_mode; | 1050 current_overscroll_gesture_ = new_mode; |
| 1050 navigation_overlay_->relay_delegate()->OnOverscrollModeChange(old_mode, | 1051 navigation_overlay_->relay_delegate()->OnOverscrollModeChange( |
| 1051 new_mode); | 1052 old_mode, new_mode, source); |
| 1052 completed_overscroll_gesture_ = OVERSCROLL_NONE; | 1053 completed_overscroll_gesture_ = OVERSCROLL_NONE; |
| 1053 } | 1054 } |
| 1054 | 1055 |
| 1055 //////////////////////////////////////////////////////////////////////////////// | 1056 //////////////////////////////////////////////////////////////////////////////// |
| 1056 // WebContentsViewAura, aura::WindowDelegate implementation: | 1057 // WebContentsViewAura, aura::WindowDelegate implementation: |
| 1057 | 1058 |
| 1058 gfx::Size WebContentsViewAura::GetMinimumSize() const { | 1059 gfx::Size WebContentsViewAura::GetMinimumSize() const { |
| 1059 return gfx::Size(); | 1060 return gfx::Size(); |
| 1060 } | 1061 } |
| 1061 | 1062 |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 bool allow_multiple_selection) { | 1325 bool allow_multiple_selection) { |
| 1325 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; | 1326 NOTIMPLEMENTED() << " show " << items.size() << " menu items"; |
| 1326 } | 1327 } |
| 1327 | 1328 |
| 1328 void WebContentsViewAura::HidePopupMenu() { | 1329 void WebContentsViewAura::HidePopupMenu() { |
| 1329 NOTIMPLEMENTED(); | 1330 NOTIMPLEMENTED(); |
| 1330 } | 1331 } |
| 1331 #endif | 1332 #endif |
| 1332 | 1333 |
| 1333 } // namespace content | 1334 } // namespace content |
| OLD | NEW |