summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 19:57:10 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 19:57:10 +0000
commite04b051f8bb42b39b449825fca2fd0f6d0677620 (patch)
tree94cf7235d530ec9693c9c210bd7790426f9e51c7 /chrome/browser
parent0e51b4fe20105bec9d30845406ce33707794629f (diff)
downloadchromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.zip
chromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.tar.gz
chromium_src-e04b051f8bb42b39b449825fca2fd0f6d0677620.tar.bz2
Fix uninitialized memory error caused by r50606.
BUG=48269 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/cocoa/tab_window_controller.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm
index 00d9d0e..c1701f1 100644
--- a/chrome/browser/cocoa/tab_window_controller.mm
+++ b/chrome/browser/cocoa/tab_window_controller.mm
@@ -65,9 +65,10 @@
// view hierarchy as a sibling of the content view so it can overlap with the
// window frame.
- (void)addTopTabStripToWindow {
+ NSRect contentFrame = [tabContentArea_ frame];
NSRect tabFrame =
- NSMakeRect(0, NSMaxY(tabFrame),
- NSWidth([tabContentArea_ frame]),
+ NSMakeRect(0, NSMaxY(contentFrame),
+ NSWidth(contentFrame),
NSHeight([topTabStripView_ frame]));
[topTabStripView_ setFrame:tabFrame];
NSView* contentParent = [[[self window] contentView] superview];