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

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

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 private: 51 private:
52 class WindowObserver; 52 class WindowObserver;
53 #if defined(OS_WIN) 53 #if defined(OS_WIN)
54 class ChildWindowObserver; 54 class ChildWindowObserver;
55 #endif 55 #endif
56 56
57 virtual ~WebContentsViewAura(); 57 virtual ~WebContentsViewAura();
58 58
59 void SizeChangedCommon(const gfx::Size& size); 59 void SizeChangedCommon(const gfx::Size& size);
60 60
61 void EndDrag(WebKit::WebDragOperationsMask ops); 61 void EndDrag(blink::WebDragOperationsMask ops);
62 62
63 // Creates and sets up the overlay window that will be displayed during the 63 // Creates and sets up the overlay window that will be displayed during the
64 // overscroll gesture. 64 // overscroll gesture.
65 void PrepareOverscrollWindow(); 65 void PrepareOverscrollWindow();
66 66
67 // Sets up the content window in preparation for starting an overscroll 67 // Sets up the content window in preparation for starting an overscroll
68 // gesture. 68 // gesture.
69 void PrepareContentWindowForOverscroll(); 69 void PrepareContentWindowForOverscroll();
70 70
71 // Resets any in-progress animation for the overscroll gesture. Note that this 71 // Resets any in-progress animation for the overscroll gesture. Note that this
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Overridden from RenderViewHostDelegateView: 129 // Overridden from RenderViewHostDelegateView:
130 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; 130 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE;
131 virtual void ShowPopupMenu(const gfx::Rect& bounds, 131 virtual void ShowPopupMenu(const gfx::Rect& bounds,
132 int item_height, 132 int item_height,
133 double item_font_size, 133 double item_font_size,
134 int selected_item, 134 int selected_item,
135 const std::vector<MenuItem>& items, 135 const std::vector<MenuItem>& items,
136 bool right_aligned, 136 bool right_aligned,
137 bool allow_multiple_selection) OVERRIDE; 137 bool allow_multiple_selection) OVERRIDE;
138 virtual void StartDragging(const DropData& drop_data, 138 virtual void StartDragging(const DropData& drop_data,
139 WebKit::WebDragOperationsMask operations, 139 blink::WebDragOperationsMask operations,
140 const gfx::ImageSkia& image, 140 const gfx::ImageSkia& image,
141 const gfx::Vector2d& image_offset, 141 const gfx::Vector2d& image_offset,
142 const DragEventSourceInfo& event_info) OVERRIDE; 142 const DragEventSourceInfo& event_info) OVERRIDE;
143 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; 143 virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE;
144 virtual void GotFocus() OVERRIDE; 144 virtual void GotFocus() OVERRIDE;
145 virtual void TakeFocus(bool reverse) OVERRIDE; 145 virtual void TakeFocus(bool reverse) OVERRIDE;
146 146
147 // Overridden from OverscrollControllerDelegate: 147 // Overridden from OverscrollControllerDelegate:
148 virtual gfx::Rect GetVisibleBounds() const OVERRIDE; 148 virtual gfx::Rect GetVisibleBounds() const OVERRIDE;
149 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE; 149 virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE;
150 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE; 150 virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE;
151 virtual void OnOverscrollModeChange(OverscrollMode old_mode, 151 virtual void OnOverscrollModeChange(OverscrollMode old_mode,
152 OverscrollMode new_mode) OVERRIDE; 152 OverscrollMode new_mode) OVERRIDE;
153 153
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 scoped_ptr<WindowObserver> window_observer_; 195 scoped_ptr<WindowObserver> window_observer_;
196 #if defined(OS_WIN) 196 #if defined(OS_WIN)
197 scoped_ptr<ChildWindowObserver> child_window_observer_; 197 scoped_ptr<ChildWindowObserver> child_window_observer_;
198 #endif 198 #endif
199 199
200 // The WebContentsImpl whose contents we display. 200 // The WebContentsImpl whose contents we display.
201 WebContentsImpl* web_contents_; 201 WebContentsImpl* web_contents_;
202 202
203 scoped_ptr<WebContentsViewDelegate> delegate_; 203 scoped_ptr<WebContentsViewDelegate> delegate_;
204 204
205 WebKit::WebDragOperationsMask current_drag_op_; 205 blink::WebDragOperationsMask current_drag_op_;
206 206
207 scoped_ptr<DropData> current_drop_data_; 207 scoped_ptr<DropData> current_drop_data_;
208 208
209 WebDragDestDelegate* drag_dest_delegate_; 209 WebDragDestDelegate* drag_dest_delegate_;
210 210
211 // We keep track of the render view host we're dragging over. If it changes 211 // We keep track of the render view host we're dragging over. If it changes
212 // during a drag, we need to re-send the DragEnter message. WARNING: 212 // during a drag, we need to re-send the DragEnter message. WARNING:
213 // this pointer should never be dereferenced. We only use it for comparing 213 // this pointer should never be dereferenced. We only use it for comparing
214 // pointers. 214 // pointers.
215 void* current_rvh_for_drag_; 215 void* current_rvh_for_drag_;
(...skipping 14 matching lines...) Expand all
230 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_; 230 scoped_ptr<ShadowLayerDelegate> overscroll_shadow_;
231 231
232 scoped_ptr<TouchEditableImplAura> touch_editable_; 232 scoped_ptr<TouchEditableImplAura> touch_editable_;
233 233
234 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 234 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
235 }; 235 };
236 236
237 } // namespace content 237 } // namespace content
238 238
239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 239 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_android.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