Index: ui/views/cocoa/bridged_content_view.mm |
diff --git a/ui/views/cocoa/bridged_content_view.mm b/ui/views/cocoa/bridged_content_view.mm |
index 58d2972393fb4a50bdef72df2e69a4326d8cf4ca..5ff0f30a9ec36d7ed5fe6857270d52dd5a6e60de 100644 |
--- a/ui/views/cocoa/bridged_content_view.mm |
+++ b/ui/views/cocoa/bridged_content_view.mm |
@@ -248,7 +248,21 @@ bool DispatchEventToMenu(views::Widget* widget, ui::KeyboardCode key_code) { |
return YES; |
} |
+- (void)viewDidMoveToWindow { |
+ // When this view is added to a window, AppKit calls setFrameSize before it is |
jackhou1
2015/03/13 23:32:55
Overriding viewDidMoveToWindow is one option. I li
tapted
2015/03/18 00:06:39
Yeah I like this.
|
+ // added to the window, so the behavior in setFrameSize is not triggered. |
+ NSWindow* window = [self window]; |
+ if (window) |
+ [self setFrameSize:NSZeroSize]; |
+} |
+ |
- (void)setFrameSize:(NSSize)newSize { |
+ // The size passed in here does not always use |
+ // -[NSWindow contentRectForFrameRect]. |
tapted
2015/03/18 00:06:39
This needs a comment like
The following ensures t
jackhou1
2015/03/18 03:44:39
Done.
|
+ NSWindow* window = [self window]; |
+ if (window) |
+ newSize = [window contentRectForFrameRect:[window frame]].size; |
+ |
[super setFrameSize:newSize]; |
if (!hostedView_) |
return; |