| 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/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 void OnKeyEvent(ui::KeyEvent* event) override; | 179 void OnKeyEvent(ui::KeyEvent* event) override; |
| 180 void OnMouseEvent(ui::MouseEvent* event) override; | 180 void OnMouseEvent(ui::MouseEvent* event) override; |
| 181 | 181 |
| 182 // Overridden from aura::client::DragDropDelegate: | 182 // Overridden from aura::client::DragDropDelegate: |
| 183 void OnDragEntered(const ui::DropTargetEvent& event) override; | 183 void OnDragEntered(const ui::DropTargetEvent& event) override; |
| 184 int OnDragUpdated(const ui::DropTargetEvent& event) override; | 184 int OnDragUpdated(const ui::DropTargetEvent& event) override; |
| 185 void OnDragExited() override; | 185 void OnDragExited() override; |
| 186 int OnPerformDrop(const ui::DropTargetEvent& event) override; | 186 int OnPerformDrop(const ui::DropTargetEvent& event) override; |
| 187 | 187 |
| 188 // Overridden from aura::WindowObserver: | 188 // Overridden from aura::WindowObserver: |
| 189 void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; | 189 void OnWindowVisibilityChanged(aura::Window* window, bool visible, |
| 190 | 190 bool content_visible) override; |
| 191 // Update the web contents visiblity. | 191 // Update the web contents visiblity. |
| 192 void UpdateWebContentsVisibility(bool visible); | 192 void UpdateWebContentsVisibility(bool visible, bool content_visible); |
| 193 | 193 |
| 194 scoped_ptr<aura::Window> window_; | 194 scoped_ptr<aura::Window> window_; |
| 195 | 195 |
| 196 // The window that shows the screenshot of the history page during an | 196 // The window that shows the screenshot of the history page during an |
| 197 // overscroll navigation gesture. | 197 // overscroll navigation gesture. |
| 198 scoped_ptr<aura::Window> overscroll_window_; | 198 scoped_ptr<aura::Window> overscroll_window_; |
| 199 | 199 |
| 200 scoped_ptr<WindowObserver> window_observer_; | 200 scoped_ptr<WindowObserver> window_observer_; |
| 201 | 201 |
| 202 // The WebContentsImpl whose contents we display. | 202 // The WebContentsImpl whose contents we display. |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 // On Windows we can run into problems if resources get released within the | 237 // On Windows we can run into problems if resources get released within the |
| 238 // initialization phase while the content (and its dimensions) are not known. | 238 // initialization phase while the content (and its dimensions) are not known. |
| 239 bool is_or_was_visible_; | 239 bool is_or_was_visible_; |
| 240 | 240 |
| 241 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 241 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 242 }; | 242 }; |
| 243 | 243 |
| 244 } // namespace content | 244 } // namespace content |
| 245 | 245 |
| 246 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 246 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |