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

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

Issue 10273030: Fix Bookmark manager DnD: WebDragDestinationDelegate was getting recreated with (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
« 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 #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 19 matching lines...) Expand all
30 public: 30 public:
31 WebContentsViewAura(WebContentsImpl* web_contents, 31 WebContentsViewAura(WebContentsImpl* web_contents,
32 content::WebContentsViewDelegate* delegate); 32 content::WebContentsViewDelegate* delegate);
33 virtual ~WebContentsViewAura(); 33 virtual ~WebContentsViewAura();
34 34
35 private: 35 private:
36 void SizeChangedCommon(const gfx::Size& size); 36 void SizeChangedCommon(const gfx::Size& size);
37 37
38 void EndDrag(WebKit::WebDragOperationsMask ops); 38 void EndDrag(WebKit::WebDragOperationsMask ops);
39 39
40 content::WebDragDestDelegate* GetDragDestDelegate();
41
42 // Overridden from WebContentsView: 40 // Overridden from WebContentsView:
43 virtual void CreateView(const gfx::Size& initial_size) OVERRIDE; 41 virtual void CreateView(const gfx::Size& initial_size) OVERRIDE;
44 virtual content::RenderWidgetHostView* CreateViewForWidget( 42 virtual content::RenderWidgetHostView* CreateViewForWidget(
45 content::RenderWidgetHost* render_widget_host) OVERRIDE; 43 content::RenderWidgetHost* render_widget_host) OVERRIDE;
46 virtual gfx::NativeView GetNativeView() const OVERRIDE; 44 virtual gfx::NativeView GetNativeView() const OVERRIDE;
47 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 45 virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
48 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 46 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
49 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE; 47 virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
50 virtual void SetPageTitle(const string16& title) OVERRIDE; 48 virtual void SetPageTitle(const string16& title) OVERRIDE;
51 virtual void OnTabCrashed(base::TerminationStatus status, 49 virtual void OnTabCrashed(base::TerminationStatus status,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 128
131 // Common implementations of some WebContentsView methods. 129 // Common implementations of some WebContentsView methods.
132 WebContentsViewHelper web_contents_view_helper_; 130 WebContentsViewHelper web_contents_view_helper_;
133 131
134 WebKit::WebDragOperationsMask current_drag_op_; 132 WebKit::WebDragOperationsMask current_drag_op_;
135 133
136 // Set to true if we want to close the tab after the system drag operation 134 // Set to true if we want to close the tab after the system drag operation
137 // has finished. 135 // has finished.
138 bool close_tab_after_drag_ends_; 136 bool close_tab_after_drag_ends_;
139 137
138 content::WebDragDestDelegate* drag_dest_delegate_;
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_
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