| 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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 | 153 |
| 154 // Overridden from aura::client::DragDropDelegate: | 154 // Overridden from aura::client::DragDropDelegate: |
| 155 void OnDragEntered(const ui::DropTargetEvent& event) override; | 155 void OnDragEntered(const ui::DropTargetEvent& event) override; |
| 156 int OnDragUpdated(const ui::DropTargetEvent& event) override; | 156 int OnDragUpdated(const ui::DropTargetEvent& event) override; |
| 157 void OnDragExited() override; | 157 void OnDragExited() override; |
| 158 int OnPerformDrop(const ui::DropTargetEvent& event) override; | 158 int OnPerformDrop(const ui::DropTargetEvent& event) override; |
| 159 | 159 |
| 160 // Overridden from aura::WindowObserver: | 160 // Overridden from aura::WindowObserver: |
| 161 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; | 161 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; |
| 162 | 162 |
| 163 // Update the web contents visiblity. | |
| 164 void UpdateWebContentsVisibility(bool visible); | |
| 165 | |
| 166 FRIEND_TEST_ALL_PREFIXES(WebContentsViewAuraTest, EnableDisableOverscroll); | 163 FRIEND_TEST_ALL_PREFIXES(WebContentsViewAuraTest, EnableDisableOverscroll); |
| 167 | 164 |
| 168 scoped_ptr<aura::Window> window_; | 165 scoped_ptr<aura::Window> window_; |
| 169 | 166 |
| 170 scoped_ptr<WindowObserver> window_observer_; | 167 scoped_ptr<WindowObserver> window_observer_; |
| 171 | 168 |
| 172 // The WebContentsImpl whose contents we display. | 169 // The WebContentsImpl whose contents we display. |
| 173 WebContentsImpl* web_contents_; | 170 WebContentsImpl* web_contents_; |
| 174 | 171 |
| 175 scoped_ptr<WebContentsViewDelegate> delegate_; | 172 scoped_ptr<WebContentsViewDelegate> delegate_; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 192 // This is the completed overscroll gesture. This is used for the animation | 189 // This is the completed overscroll gesture. This is used for the animation |
| 193 // callback that happens in response to a completed overscroll gesture. | 190 // callback that happens in response to a completed overscroll gesture. |
| 194 OverscrollMode completed_overscroll_gesture_; | 191 OverscrollMode completed_overscroll_gesture_; |
| 195 | 192 |
| 196 // This manages the overlay window that shows the screenshot during a history | 193 // This manages the overlay window that shows the screenshot during a history |
| 197 // navigation triggered by the overscroll gesture. | 194 // navigation triggered by the overscroll gesture. |
| 198 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; | 195 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; |
| 199 | 196 |
| 200 scoped_ptr<GestureNavSimple> gesture_nav_simple_; | 197 scoped_ptr<GestureNavSimple> gesture_nav_simple_; |
| 201 | 198 |
| 202 // On Windows we can run into problems if resources get released within the | |
| 203 // initialization phase while the content (and its dimensions) are not known. | |
| 204 bool is_or_was_visible_; | |
| 205 | |
| 206 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 199 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 207 }; | 200 }; |
| 208 | 201 |
| 209 } // namespace content | 202 } // namespace content |
| 210 | 203 |
| 211 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 204 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |