| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; | 115 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; |
| 116 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; | 116 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; |
| 117 virtual void OnDragExited() OVERRIDE; | 117 virtual void OnDragExited() OVERRIDE; |
| 118 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE; | 118 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE; |
| 119 | 119 |
| 120 gfx::Size initial_size_; | 120 gfx::Size initial_size_; |
| 121 | 121 |
| 122 scoped_ptr<aura::Window> window_; | 122 scoped_ptr<aura::Window> window_; |
| 123 | 123 |
| 124 // The WebContentsImpl whose contents we display. | 124 // The WebContentsImpl whose contents we display. |
| 125 WebContentsImpl* tab_contents_; | 125 WebContentsImpl* web_contents_; |
| 126 | 126 |
| 127 content::RenderWidgetHostView* view_; | 127 content::RenderWidgetHostView* view_; |
| 128 | 128 |
| 129 scoped_ptr<content::WebContentsViewDelegate> delegate_; | 129 scoped_ptr<content::WebContentsViewDelegate> delegate_; |
| 130 | 130 |
| 131 // Common implementations of some WebContentsView methods. | 131 // Common implementations of some WebContentsView methods. |
| 132 WebContentsViewHelper web_contents_view_helper_; | 132 WebContentsViewHelper web_contents_view_helper_; |
| 133 | 133 |
| 134 WebKit::WebDragOperationsMask current_drag_op_; | 134 WebKit::WebDragOperationsMask current_drag_op_; |
| 135 | 135 |
| 136 // Set to true if we want to close the tab after the system drag operation | 136 // Set to true if we want to close the tab after the system drag operation |
| 137 // has finished. | 137 // has finished. |
| 138 bool close_tab_after_drag_ends_; | 138 bool close_tab_after_drag_ends_; |
| 139 | 139 |
| 140 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 140 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 143 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |