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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.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: RenderText fixup 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_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 11 matching lines...) Expand all
22 @class WebDragDest; 22 @class WebDragDest;
23 @class WebDragSource; 23 @class WebDragSource;
24 24
25 namespace content { 25 namespace content {
26 class WebContentsImpl; 26 class WebContentsImpl;
27 class WebContentsViewDelegate; 27 class WebContentsViewDelegate;
28 class WebContentsViewMac; 28 class WebContentsViewMac;
29 } 29 }
30 30
31 namespace gfx { 31 namespace gfx {
32 class Point; 32 class Vector2d;
33 } 33 }
34 34
35 @interface WebContentsViewCocoa : BaseView { 35 @interface WebContentsViewCocoa : BaseView {
36 @private 36 @private
37 content::WebContentsViewMac* webContentsView_; // WEAK; owns us 37 content::WebContentsViewMac* webContentsView_; // WEAK; owns us
38 scoped_nsobject<WebDragSource> dragSource_; 38 scoped_nsobject<WebDragSource> dragSource_;
39 scoped_nsobject<WebDragDest> dragDest_; 39 scoped_nsobject<WebDragDest> dragDest_;
40 BOOL mouseDownCanMoveWindow_; 40 BOOL mouseDownCanMoveWindow_;
41 } 41 }
42 42
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 virtual void ShowPopupMenu(const gfx::Rect& bounds, 90 virtual void ShowPopupMenu(const gfx::Rect& bounds,
91 int item_height, 91 int item_height,
92 double item_font_size, 92 double item_font_size,
93 int selected_item, 93 int selected_item,
94 const std::vector<WebMenuItem>& items, 94 const std::vector<WebMenuItem>& items,
95 bool right_aligned, 95 bool right_aligned,
96 bool allow_multiple_selection) OVERRIDE; 96 bool allow_multiple_selection) OVERRIDE;
97 virtual void StartDragging(const WebDropData& drop_data, 97 virtual void StartDragging(const WebDropData& drop_data,
98 WebKit::WebDragOperationsMask allowed_operations, 98 WebKit::WebDragOperationsMask allowed_operations,
99 const gfx::ImageSkia& image, 99 const gfx::ImageSkia& image,
100 const gfx::Point& image_offset) OVERRIDE; 100 const gfx::Vector2d& image_offset) OVERRIDE;
101 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; 101 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
102 virtual void GotFocus() OVERRIDE; 102 virtual void GotFocus() OVERRIDE;
103 virtual void TakeFocus(bool reverse) OVERRIDE; 103 virtual void TakeFocus(bool reverse) OVERRIDE;
104 104
105 // A helper method for closing the tab in the 105 // A helper method for closing the tab in the
106 // CloseTabAfterEventTracking() implementation. 106 // CloseTabAfterEventTracking() implementation.
107 void CloseTab(); 107 void CloseTab();
108 108
109 WebContentsImpl* web_contents() { return web_contents_; } 109 WebContentsImpl* web_contents() { return web_contents_; }
110 WebContentsViewDelegate* delegate() { return delegate_.get(); } 110 WebContentsViewDelegate* delegate() { return delegate_.get(); }
(...skipping 11 matching lines...) Expand all
122 122
123 // Our optional delegate. 123 // Our optional delegate.
124 scoped_ptr<WebContentsViewDelegate> delegate_; 124 scoped_ptr<WebContentsViewDelegate> delegate_;
125 125
126 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 126 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
127 }; 127 };
128 128
129 } // namespace content 129 } // namespace content
130 130
131 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 131 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698