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

Side by Side Diff: ui/views/cocoa/bridged_native_widget.h

Issue 927233003: MacViews: Fix positioning of top-level Widgets with parents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5
Patch Set: Use kWindowSizeDeterminedLater Created 5 years, 10 months 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_ 5 #ifndef UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
6 #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_ 6 #define UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 const std::vector<ui::LatencyInfo>& latency_info) override; 204 const std::vector<ui::LatencyInfo>& latency_info) override;
205 void AcceleratedWidgetHitError() override; 205 void AcceleratedWidgetHitError() override;
206 206
207 views::NativeWidgetMac* native_widget_mac_; // Weak. Owns this. 207 views::NativeWidgetMac* native_widget_mac_; // Weak. Owns this.
208 base::scoped_nsobject<NSWindow> window_; 208 base::scoped_nsobject<NSWindow> window_;
209 base::scoped_nsobject<ViewsNSWindowDelegate> window_delegate_; 209 base::scoped_nsobject<ViewsNSWindowDelegate> window_delegate_;
210 base::scoped_nsobject<BridgedContentView> bridged_view_; 210 base::scoped_nsobject<BridgedContentView> bridged_view_;
211 scoped_ptr<ui::InputMethod> input_method_; 211 scoped_ptr<ui::InputMethod> input_method_;
212 scoped_ptr<CocoaMouseCapture> mouse_capture_; 212 scoped_ptr<CocoaMouseCapture> mouse_capture_;
213 FocusManager* focus_manager_; // Weak. Owned by our Widget. 213 FocusManager* focus_manager_; // Weak. Owned by our Widget.
214 Widget::InitParams::Type widget_type_;
214 215
215 BridgedNativeWidget* parent_; // Weak. If non-null, owns this. 216 BridgedNativeWidget* parent_; // Weak. If non-null, owns this.
216 std::vector<BridgedNativeWidget*> child_windows_; 217 std::vector<BridgedNativeWidget*> child_windows_;
217 218
218 base::scoped_nsobject<NSView> compositor_superview_; 219 base::scoped_nsobject<NSView> compositor_superview_;
219 scoped_ptr<ui::AcceleratedWidgetMac> compositor_widget_; 220 scoped_ptr<ui::AcceleratedWidgetMac> compositor_widget_;
220 scoped_ptr<ui::Compositor> compositor_; 221 scoped_ptr<ui::Compositor> compositor_;
221 222
222 // Tracks the bounds when the window last started entering fullscreen. Used to 223 // Tracks the bounds when the window last started entering fullscreen. Used to
223 // provide an answer for GetRestoredBounds(), but not ever sent to Cocoa (it 224 // provide an answer for GetRestoredBounds(), but not ever sent to Cocoa (it
(...skipping 15 matching lines...) Expand all
239 // If true, the window is either visible, or wants to be visible but is 240 // If true, the window is either visible, or wants to be visible but is
240 // currently hidden due to having a hidden parent. 241 // currently hidden due to having a hidden parent.
241 bool wants_to_be_visible_; 242 bool wants_to_be_visible_;
242 243
243 DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget); 244 DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidget);
244 }; 245 };
245 246
246 } // namespace views 247 } // namespace views
247 248
248 #endif // UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_ 249 #endif // UI_VIEWS_COCOA_BRIDGED_NATIVE_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698