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

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

Issue 670653005: Fix Flash fullscreen focus regressions, and add interactive_ui_tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove consts in ObjC code. Created 6 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
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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void TakeFocus(bool reverse) override; 115 void TakeFocus(bool reverse) override;
116 116
117 // A helper method for closing the tab in the 117 // A helper method for closing the tab in the
118 // CloseTabAfterEventTracking() implementation. 118 // CloseTabAfterEventTracking() implementation.
119 void CloseTab(); 119 void CloseTab();
120 120
121 WebContentsImpl* web_contents() { return web_contents_; } 121 WebContentsImpl* web_contents() { return web_contents_; }
122 WebContentsViewDelegate* delegate() { return delegate_.get(); } 122 WebContentsViewDelegate* delegate() { return delegate_.get(); }
123 123
124 private: 124 private:
125 // Returns the fullscreen view, if one exists; otherwise, returns the content
126 // native view. This ensures that the view currently attached to a NSWindow is
127 // being used to query or set first responder state.
128 gfx::NativeView GetNativeViewForFocus() const;
129
125 // The WebContentsImpl whose contents we display. 130 // The WebContentsImpl whose contents we display.
126 WebContentsImpl* web_contents_; 131 WebContentsImpl* web_contents_;
127 132
128 // The Cocoa NSView that lives in the view hierarchy. 133 // The Cocoa NSView that lives in the view hierarchy.
129 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_; 134 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
130 135
131 // Keeps track of which NSView has focus so we can restore the focus when 136 // Keeps track of which NSView has focus so we can restore the focus when
132 // focus returns. 137 // focus returns.
133 base::scoped_nsobject<FocusTracker> focus_tracker_; 138 base::scoped_nsobject<FocusTracker> focus_tracker_;
134 139
135 // Our optional delegate. 140 // Our optional delegate.
136 scoped_ptr<WebContentsViewDelegate> delegate_; 141 scoped_ptr<WebContentsViewDelegate> delegate_;
137 142
138 // Whether to allow other views. 143 // Whether to allow other views.
139 bool allow_other_views_; 144 bool allow_other_views_;
140 145
141 scoped_ptr<PopupMenuHelper> popup_menu_helper_; 146 scoped_ptr<PopupMenuHelper> popup_menu_helper_;
142 147
143 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 148 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
144 }; 149 };
145 150
146 } // namespace content 151 } // namespace content
147 152
148 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 153 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.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