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

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

Issue 11418244: Order the GL overlays above windows if possible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops, null check Created 8 years 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 int error_code) OVERRIDE; 78 int error_code) OVERRIDE;
79 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 79 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
80 virtual void Focus() OVERRIDE; 80 virtual void Focus() OVERRIDE;
81 virtual void SetInitialFocus() OVERRIDE; 81 virtual void SetInitialFocus() OVERRIDE;
82 virtual void StoreFocus() OVERRIDE; 82 virtual void StoreFocus() OVERRIDE;
83 virtual void RestoreFocus() OVERRIDE; 83 virtual void RestoreFocus() OVERRIDE;
84 virtual WebDropData* GetDropData() const OVERRIDE; 84 virtual WebDropData* GetDropData() const OVERRIDE;
85 virtual bool IsEventTracking() const OVERRIDE; 85 virtual bool IsEventTracking() const OVERRIDE;
86 virtual void CloseTabAfterEventTracking() OVERRIDE; 86 virtual void CloseTabAfterEventTracking() OVERRIDE;
87 virtual gfx::Rect GetViewBounds() const OVERRIDE; 87 virtual gfx::Rect GetViewBounds() const OVERRIDE;
88 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
88 89
89 // Backend implementation of RenderViewHostDelegateView. 90 // Backend implementation of RenderViewHostDelegateView.
90 virtual void ShowContextMenu(const ContextMenuParams& params, 91 virtual void ShowContextMenu(const ContextMenuParams& params,
91 ContextMenuSourceType type) OVERRIDE; 92 ContextMenuSourceType type) OVERRIDE;
92 virtual void ShowPopupMenu(const gfx::Rect& bounds, 93 virtual void ShowPopupMenu(const gfx::Rect& bounds,
93 int item_height, 94 int item_height,
94 double item_font_size, 95 double item_font_size,
95 int selected_item, 96 int selected_item,
96 const std::vector<WebMenuItem>& items, 97 const std::vector<WebMenuItem>& items,
97 bool right_aligned, 98 bool right_aligned,
(...skipping 21 matching lines...) Expand all
119 // The Cocoa NSView that lives in the view hierarchy. 120 // The Cocoa NSView that lives in the view hierarchy.
120 scoped_nsobject<WebContentsViewCocoa> cocoa_view_; 121 scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
121 122
122 // Keeps track of which NSView has focus so we can restore the focus when 123 // Keeps track of which NSView has focus so we can restore the focus when
123 // focus returns. 124 // focus returns.
124 scoped_nsobject<FocusTracker> focus_tracker_; 125 scoped_nsobject<FocusTracker> focus_tracker_;
125 126
126 // Our optional delegate. 127 // Our optional delegate.
127 scoped_ptr<WebContentsViewDelegate> delegate_; 128 scoped_ptr<WebContentsViewDelegate> delegate_;
128 129
130 // Whether to allow overlapping views.
131 bool allow_overlapping_views_;
132
129 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 133 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
130 }; 134 };
131 135
132 } // namespace content 136 } // namespace content
133 137
134 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 138 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.cc ('k') | content/browser/web_contents/web_contents_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698