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

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

Issue 10388105: aura: Fix a couple of bug (really the same bug at two different places) for drag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 years, 7 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
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 #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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 WebContentsViewHelper web_contents_view_helper_; 131 WebContentsViewHelper web_contents_view_helper_;
132 132
133 WebKit::WebDragOperationsMask current_drag_op_; 133 WebKit::WebDragOperationsMask current_drag_op_;
134 134
135 // Set to true if we want to close the tab after the system drag operation 135 // Set to true if we want to close the tab after the system drag operation
136 // has finished. 136 // has finished.
137 bool close_tab_after_drag_ends_; 137 bool close_tab_after_drag_ends_;
138 138
139 content::WebDragDestDelegate* drag_dest_delegate_; 139 content::WebDragDestDelegate* drag_dest_delegate_;
140 140
141 // We keep track of the render view host we're dragging over. If it changes
142 // during a drag, we need to re-send the DragEnter message. WARNING:
143 // this pointer should never be dereferenced. We only use it for comparing
144 // pointers.
145 void* current_rvh_for_drag_;
146
141 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 147 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
142 }; 148 };
143 149
144 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 150 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698