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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_window_controller.mm

Issue 11745004: Merge 173785 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" 5 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #import "chrome/browser/ui/cocoa/fast_resize_view.h" 8 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
9 #import "chrome/browser/ui/cocoa/framed_browser_window.h" 9 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
10 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 10 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 @end 42 @end
43 43
44 @implementation TabWindowController 44 @implementation TabWindowController
45 45
46 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip { 46 - (id)initTabWindowControllerWithTabStrip:(BOOL)hasTabStrip {
47 NSRect contentRect = NSMakeRect(60, 229, 750, 600); 47 NSRect contentRect = NSMakeRect(60, 229, 750, 600);
48 scoped_nsobject<FramedBrowserWindow> window( 48 scoped_nsobject<FramedBrowserWindow> window(
49 [[FramedBrowserWindow alloc] initWithContentRect:contentRect 49 [[FramedBrowserWindow alloc] initWithContentRect:contentRect
50 hasTabStrip:hasTabStrip]); 50 hasTabStrip:hasTabStrip]);
51 [window setReleasedWhenClosed:YES]; 51 [window setReleasedWhenClosed:YES];
52 [window setAutorecalculatesKeyViewLoop:YES];
52 53
53 if ((self = [super initWithWindow:window])) { 54 if ((self = [super initWithWindow:window])) {
54 [[self window] setDelegate:self]; 55 [[self window] setDelegate:self];
55 56
56 tabContentArea_.reset([[FastResizeView alloc] initWithFrame: 57 tabContentArea_.reset([[FastResizeView alloc] initWithFrame:
57 NSMakeRect(0, 0, 750, 600)]); 58 NSMakeRect(0, 0, 750, 600)]);
58 [tabContentArea_ setAutoresizingMask:NSViewWidthSizable | 59 [tabContentArea_ setAutoresizingMask:NSViewWidthSizable |
59 NSViewHeightSizable]; 60 NSViewHeightSizable];
60 [[[self window] contentView] addSubview:tabContentArea_]; 61 [[[self window] contentView] addSubview:tabContentArea_];
61 62
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 closeDeferred_ = YES; 285 closeDeferred_ = YES;
285 } 286 }
286 287
287 // Called when the size of the window content area has changed. Override to 288 // Called when the size of the window content area has changed. Override to
288 // position specific views. Base class implementation does nothing. 289 // position specific views. Base class implementation does nothing.
289 - (void)layoutSubviews { 290 - (void)layoutSubviews {
290 NOTIMPLEMENTED(); 291 NOTIMPLEMENTED();
291 } 292 }
292 293
293 @end 294 @end
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698