Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 10945037: Remove unused field from WebContentsViewAura and add comment as to why (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 116 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
117 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 117 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
118 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 118 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
119 119
120 // Overridden from aura::client::DragDropDelegate: 120 // Overridden from aura::client::DragDropDelegate:
121 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 121 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
122 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 122 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
123 virtual void OnDragExited() OVERRIDE; 123 virtual void OnDragExited() OVERRIDE;
124 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 124 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
125 125
126 gfx::Size initial_size_;
127
128 scoped_ptr<aura::Window> window_; 126 scoped_ptr<aura::Window> window_;
129 127
130 // The WebContentsImpl whose contents we display. 128 // The WebContentsImpl whose contents we display.
131 WebContentsImpl* web_contents_; 129 WebContentsImpl* web_contents_;
132 130
133 content::RenderWidgetHostView* view_; 131 content::RenderWidgetHostView* view_;
134 132
135 scoped_ptr<content::WebContentsViewDelegate> delegate_; 133 scoped_ptr<content::WebContentsViewDelegate> delegate_;
136 134
137 WebKit::WebDragOperationsMask current_drag_op_; 135 WebKit::WebDragOperationsMask current_drag_op_;
138 136
139 // Set to true if we want to close the tab after the system drag operation 137 // Set to true if we want to close the tab after the system drag operation
140 // has finished. 138 // has finished.
141 bool close_tab_after_drag_ends_; 139 bool close_tab_after_drag_ends_;
142 140
143 content::WebDragDestDelegate* drag_dest_delegate_; 141 content::WebDragDestDelegate* drag_dest_delegate_;
144 142
145 // We keep track of the render view host we're dragging over. If it changes 143 // We keep track of the render view host we're dragging over. If it changes
146 // during a drag, we need to re-send the DragEnter message. WARNING: 144 // during a drag, we need to re-send the DragEnter message. WARNING:
147 // this pointer should never be dereferenced. We only use it for comparing 145 // this pointer should never be dereferenced. We only use it for comparing
148 // pointers. 146 // pointers.
149 void* current_rvh_for_drag_; 147 void* current_rvh_for_drag_;
150 148
151 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 149 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
152 }; 150 };
153 151
154 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 152 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698