| OLD | NEW |
| 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/tabpose_window.h" | 5 #import "chrome/browser/ui/cocoa/tabpose_window.h" |
| 6 | 6 |
| 7 #import <QuartzCore/QuartzCore.h> | 7 #import <QuartzCore/QuartzCore.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 backing:NSBackingStoreBuffered | 943 backing:NSBackingStoreBuffered |
| 944 defer:NO])) { | 944 defer:NO])) { |
| 945 containingRect_ = rect; | 945 containingRect_ = rect; |
| 946 tabStripModel_ = tabStripModel; | 946 tabStripModel_ = tabStripModel; |
| 947 state_ = tabpose::kFadingIn; | 947 state_ = tabpose::kFadingIn; |
| 948 tileSet_.reset(new tabpose::TileSet); | 948 tileSet_.reset(new tabpose::TileSet); |
| 949 tabStripModelObserverBridge_.reset( | 949 tabStripModelObserverBridge_.reset( |
| 950 new TabStripModelObserverBridge(tabStripModel_, self)); | 950 new TabStripModelObserverBridge(tabStripModel_, self)); |
| 951 NSImage* nsCloseIcon = | 951 NSImage* nsCloseIcon = |
| 952 ResourceBundle::GetSharedInstance().GetNativeImageNamed( | 952 ResourceBundle::GetSharedInstance().GetNativeImageNamed( |
| 953 IDR_TABPOSE_CLOSE); | 953 IDR_TABPOSE_CLOSE).ToNSImage(); |
| 954 closeIcon_.reset(base::mac::CopyNSImageToCGImage(nsCloseIcon)); | 954 closeIcon_.reset(base::mac::CopyNSImageToCGImage(nsCloseIcon)); |
| 955 [self setReleasedWhenClosed:YES]; | 955 [self setReleasedWhenClosed:YES]; |
| 956 [self setOpaque:NO]; | 956 [self setOpaque:NO]; |
| 957 [self setBackgroundColor:[NSColor clearColor]]; | 957 [self setBackgroundColor:[NSColor clearColor]]; |
| 958 [self setUpLayersInSlomo:slomo]; | 958 [self setUpLayersInSlomo:slomo]; |
| 959 [self setAcceptsMouseMovedEvents:YES]; | 959 [self setAcceptsMouseMovedEvents:YES]; |
| 960 [parent addChildWindow:self ordered:NSWindowAbove]; | 960 [parent addChildWindow:self ordered:NSWindowAbove]; |
| 961 [self makeKeyAndOrderFront:self]; | 961 [self makeKeyAndOrderFront:self]; |
| 962 } | 962 } |
| 963 return self; | 963 return self; |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1667 tile.set_tab_contents(contents); | 1667 tile.set_tab_contents(contents); |
| 1668 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index]; | 1668 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index]; |
| 1669 [thumbLayer setTabContents:contents]; | 1669 [thumbLayer setTabContents:contents]; |
| 1670 } | 1670 } |
| 1671 | 1671 |
| 1672 - (void)tabStripModelDeleted { | 1672 - (void)tabStripModelDeleted { |
| 1673 [self close]; | 1673 [self close]; |
| 1674 } | 1674 } |
| 1675 | 1675 |
| 1676 @end | 1676 @end |
| OLD | NEW |