| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/aura/overscroll_navigation_overlay.h" | 5 #include "content/browser/web_contents/aura/overscroll_navigation_overlay.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/macros.h" |
| 10 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
| 11 #include "content/browser/frame_host/navigation_entry_impl.h" | 12 #include "content/browser/frame_host/navigation_entry_impl.h" |
| 12 #include "content/browser/renderer_host/render_view_host_impl.h" | 13 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 13 #include "content/browser/web_contents/aura/overscroll_window_delegate.h" | 14 #include "content/browser/web_contents/aura/overscroll_window_delegate.h" |
| 14 #include "content/browser/web_contents/web_contents_impl.h" | 15 #include "content/browser/web_contents/web_contents_impl.h" |
| 15 #include "content/common/view_messages.h" | 16 #include "content/common/view_messages.h" |
| 16 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
| 17 #include "content/public/browser/render_widget_host_view.h" | 18 #include "content/public/browser/render_widget_host_view.h" |
| 18 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
| 19 #include "ui/base/layout.h" | 20 #include "ui/base/layout.h" |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 | 280 |
| 280 void OverscrollNavigationOverlay::DidStopLoading() { | 281 void OverscrollNavigationOverlay::DidStopLoading() { |
| 281 // Don't compare URLs in this case - it's possible they won't match if | 282 // Don't compare URLs in this case - it's possible they won't match if |
| 282 // a gesture-nav initiated navigation was interrupted by some other in-site | 283 // a gesture-nav initiated navigation was interrupted by some other in-site |
| 283 // navigation (e.g., from a script, or from a bookmark). | 284 // navigation (e.g., from a script, or from a bookmark). |
| 284 loading_complete_ = true; | 285 loading_complete_ = true; |
| 285 StopObservingIfDone(); | 286 StopObservingIfDone(); |
| 286 } | 287 } |
| 287 | 288 |
| 288 } // namespace content | 289 } // namespace content |
| OLD | NEW |