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

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

Issue 11269022: Add Vector2d classes that represent offsets, instead of using Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more vector use fixes Created 8 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_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/port/browser/render_view_host_delegate_view.h" 9 #include "content/port/browser/render_view_host_delegate_view.h"
10 #include "content/public/browser/web_contents_view.h" 10 #include "content/public/browser/web_contents_view.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual void ShowPopupMenu(const gfx::Rect& bounds, 58 virtual void ShowPopupMenu(const gfx::Rect& bounds,
59 int item_height, 59 int item_height,
60 double item_font_size, 60 double item_font_size,
61 int selected_item, 61 int selected_item,
62 const std::vector<WebMenuItem>& items, 62 const std::vector<WebMenuItem>& items,
63 bool right_aligned, 63 bool right_aligned,
64 bool allow_multiple_selection) OVERRIDE; 64 bool allow_multiple_selection) OVERRIDE;
65 virtual void StartDragging(const WebDropData& drop_data, 65 virtual void StartDragging(const WebDropData& drop_data,
66 WebKit::WebDragOperationsMask allowed_ops, 66 WebKit::WebDragOperationsMask allowed_ops,
67 const gfx::ImageSkia& image, 67 const gfx::ImageSkia& image,
68 const gfx::Point& image_offset) OVERRIDE; 68 const gfx::Vector2d& image_offset) OVERRIDE;
69 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; 69 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
70 virtual void GotFocus() OVERRIDE; 70 virtual void GotFocus() OVERRIDE;
71 virtual void TakeFocus(bool reverse) OVERRIDE; 71 virtual void TakeFocus(bool reverse) OVERRIDE;
72 72
73 private: 73 private:
74 // The WebContents whose contents we display. 74 // The WebContents whose contents we display.
75 WebContentsImpl* web_contents_; 75 WebContentsImpl* web_contents_;
76 76
77 // ContentViewCoreImpl is our interface to the view system. 77 // ContentViewCoreImpl is our interface to the view system.
78 ContentViewCoreImpl* content_view_core_; 78 ContentViewCoreImpl* content_view_core_;
79 79
80 // Interface for extensions to WebContentsView. Used to show the context menu. 80 // Interface for extensions to WebContentsView. Used to show the context menu.
81 scoped_ptr<WebContentsViewDelegate> delegate_; 81 scoped_ptr<WebContentsViewDelegate> delegate_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 83 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
84 }; 84 };
85 85
86 } // namespace content 86 } // namespace content
87 87
88 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 88 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698