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 <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/metrics/histogram_macros.h" | 12 #include "base/metrics/histogram_macros.h" |
| 13 #include "base/metrics/user_metrics.h" |
13 #include "content/browser/frame_host/navigation_entry_impl.h" | 14 #include "content/browser/frame_host/navigation_entry_impl.h" |
14 #include "content/browser/renderer_host/render_view_host_impl.h" | 15 #include "content/browser/renderer_host/render_view_host_impl.h" |
15 #include "content/browser/web_contents/aura/overscroll_window_delegate.h" | 16 #include "content/browser/web_contents/aura/overscroll_window_delegate.h" |
16 #include "content/browser/web_contents/aura/uma_navigation_type.h" | 17 #include "content/browser/web_contents/aura/uma_navigation_type.h" |
17 #include "content/browser/web_contents/web_contents_impl.h" | 18 #include "content/browser/web_contents/web_contents_impl.h" |
18 #include "content/common/view_messages.h" | 19 #include "content/common/view_messages.h" |
19 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
20 #include "content/public/browser/render_widget_host_view.h" | 21 #include "content/public/browser/render_widget_host_view.h" |
21 #include "content/public/browser/user_metrics.h" | |
22 #include "ui/aura/window.h" | 22 #include "ui/aura/window.h" |
23 #include "ui/base/layout.h" | 23 #include "ui/base/layout.h" |
24 #include "ui/compositor/layer.h" | 24 #include "ui/compositor/layer.h" |
25 #include "ui/compositor/layer_animation_observer.h" | 25 #include "ui/compositor/layer_animation_observer.h" |
26 #include "ui/compositor/paint_recorder.h" | 26 #include "ui/compositor/paint_recorder.h" |
27 #include "ui/compositor/scoped_layer_animation_settings.h" | 27 #include "ui/compositor/scoped_layer_animation_settings.h" |
28 #include "ui/gfx/canvas.h" | 28 #include "ui/gfx/canvas.h" |
29 #include "ui/gfx/image/image_png_rep.h" | 29 #include "ui/gfx/image/image_png_rep.h" |
30 | 30 |
31 namespace content { | 31 namespace content { |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 | 317 |
318 void OverscrollNavigationOverlay::DidStopLoading() { | 318 void OverscrollNavigationOverlay::DidStopLoading() { |
319 // Don't compare URLs in this case - it's possible they won't match if | 319 // Don't compare URLs in this case - it's possible they won't match if |
320 // a gesture-nav initiated navigation was interrupted by some other in-site | 320 // a gesture-nav initiated navigation was interrupted by some other in-site |
321 // navigation (e.g., from a script, or from a bookmark). | 321 // navigation (e.g., from a script, or from a bookmark). |
322 loading_complete_ = true; | 322 loading_complete_ = true; |
323 StopObservingIfDone(); | 323 StopObservingIfDone(); |
324 } | 324 } |
325 | 325 |
326 } // namespace content | 326 } // namespace content |
OLD | NEW |