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

Side by Side Diff: content/browser/web_contents/web_contents_view_gtk.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_GTK_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 virtual void ShowPopupMenu(const gfx::Rect& bounds, 72 virtual void ShowPopupMenu(const gfx::Rect& bounds,
73 int item_height, 73 int item_height,
74 double item_font_size, 74 double item_font_size,
75 int selected_item, 75 int selected_item,
76 const std::vector<WebMenuItem>& items, 76 const std::vector<WebMenuItem>& items,
77 bool right_aligned, 77 bool right_aligned,
78 bool allow_multiple_selection) OVERRIDE; 78 bool allow_multiple_selection) OVERRIDE;
79 virtual void StartDragging(const WebDropData& drop_data, 79 virtual void StartDragging(const WebDropData& drop_data,
80 WebKit::WebDragOperationsMask allowed_ops, 80 WebKit::WebDragOperationsMask allowed_ops,
81 const gfx::ImageSkia& image, 81 const gfx::ImageSkia& image,
82 const gfx::Point& image_offset) OVERRIDE; 82 const gfx::Vector2d& image_offset) OVERRIDE;
83 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; 83 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
84 virtual void GotFocus() OVERRIDE; 84 virtual void GotFocus() OVERRIDE;
85 virtual void TakeFocus(bool reverse) OVERRIDE; 85 virtual void TakeFocus(bool reverse) OVERRIDE;
86 86
87 private: 87 private:
88 // Insert the given widget into the content area. Should only be used for 88 // Insert the given widget into the content area. Should only be used for
89 // web pages and the like (including interstitials and sad tab). Note that 89 // web pages and the like (including interstitials and sad tab). Note that
90 // this will be perfectly happy to insert overlapping render views, so care 90 // this will be perfectly happy to insert overlapping render views, so care
91 // should be taken that the correct one is hidden/shown. 91 // should be taken that the correct one is hidden/shown.
92 void InsertIntoContentArea(GtkWidget* widget); 92 void InsertIntoContentArea(GtkWidget* widget);
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // The size we want the view to be. We keep this in a separate variable 129 // The size we want the view to be. We keep this in a separate variable
130 // because resizing in GTK+ is async. 130 // because resizing in GTK+ is async.
131 gfx::Size requested_size_; 131 gfx::Size requested_size_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(WebContentsViewGtk); 133 DISALLOW_COPY_AND_ASSIGN(WebContentsViewGtk);
134 }; 134 };
135 135
136 } // namespace content 136 } // namespace content
137 137
138 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_ 138 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698