| 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ |
| 7 | 7 |
| 8 #include "base/gtest_prod_util.h" | 8 #include "base/gtest_prod_util.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "content/browser/web_contents/aura/window_slider.h" | 10 #include "content/browser/web_contents/aura/window_slider.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 // The screenshot overlay window. | 94 // The screenshot overlay window. |
| 95 scoped_ptr<aura::Window> window_; | 95 scoped_ptr<aura::Window> window_; |
| 96 | 96 |
| 97 // This is the WindowDelegate of |window_|. The delegate manages its own | 97 // This is the WindowDelegate of |window_|. The delegate manages its own |
| 98 // lifetime (destroys itself when |window_| is destroyed). | 98 // lifetime (destroys itself when |window_| is destroyed). |
| 99 ImageWindowDelegate* image_delegate_; | 99 ImageWindowDelegate* image_delegate_; |
| 100 | 100 |
| 101 bool loading_complete_; | 101 bool loading_complete_; |
| 102 bool received_paint_update_; | 102 bool received_paint_update_; |
| 103 | 103 |
| 104 // Unique ID of the NavigationEntry we are navigating to. This is needed to | 104 // URL of the NavigationEntry we are navigating to. This is needed to |
| 105 // filter on WebContentsObserver callbacks and is used to dismiss the overlay | 105 // filter on WebContentsObserver callbacks and is used to dismiss the overlay |
| 106 // when the relevant page loads and paints. | 106 // when the relevant page loads and paints. |
| 107 int pending_entry_id_; | 107 GURL pending_entry_url_; |
| 108 | 108 |
| 109 // The |WindowSlider| that allows sliding history layers while the page is | 109 // The |WindowSlider| that allows sliding history layers while the page is |
| 110 // being reloaded. | 110 // being reloaded. |
| 111 scoped_ptr<WindowSlider> window_slider_; | 111 scoped_ptr<WindowSlider> window_slider_; |
| 112 | 112 |
| 113 // Layer to be used for the final overlay fadeout animation when the overlay | 113 // Layer to be used for the final overlay fadeout animation when the overlay |
| 114 // is being dismissed. | 114 // is being dismissed. |
| 115 scoped_ptr<ui::Layer> overlay_dismiss_layer_; | 115 scoped_ptr<ui::Layer> overlay_dismiss_layer_; |
| 116 | 116 |
| 117 // The direction of the in-progress slide (if any). | 117 // The direction of the in-progress slide (if any). |
| 118 SlideDirection slide_direction_; | 118 SlideDirection slide_direction_; |
| 119 | 119 |
| 120 // The LayerDelegate used for the back/front layers during a slide. | 120 // The LayerDelegate used for the back/front layers during a slide. |
| 121 scoped_ptr<ImageLayerDelegate> layer_delegate_; | 121 scoped_ptr<ImageLayerDelegate> layer_delegate_; |
| 122 | 122 |
| 123 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay); | 123 DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlay); |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 } // namespace content | 126 } // namespace content |
| 127 | 127 |
| 128 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ | 128 #endif // CONTENT_BROWSER_WEB_CONTENTS_AURA_OVERSCROLL_NAVIGATION_OVERLAY_H_ |
| OLD | NEW |