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

Unified Diff: chrome/browser/ui/cocoa/tabpose_window.mm

Issue 7331042: fix for 27454 - Fade out close button state on mouse exit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix up rsesek nits Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/hover_close_button.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tabpose_window.mm
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index 1912c16389745937441fa61164528432279a2da8..e64e7d50294f82ef220c7f04822a2b4c9ff40f1a 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -20,6 +20,7 @@
#include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
#include "chrome/browser/tab_contents/thumbnail_generator.h"
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
+#include "chrome/browser/ui/cocoa/animation_utils.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
@@ -351,36 +352,6 @@ void ThumbnailLoader::LoadThumbnail() {
@end
-namespace {
-
-class ScopedCAActionDisabler {
- public:
- ScopedCAActionDisabler() {
- [CATransaction begin];
- [CATransaction setValue:[NSNumber numberWithBool:YES]
- forKey:kCATransactionDisableActions];
- }
-
- ~ScopedCAActionDisabler() {
- [CATransaction commit];
- }
-};
-
-class ScopedCAActionSetDuration {
- public:
- explicit ScopedCAActionSetDuration(CGFloat duration) {
- [CATransaction begin];
- [CATransaction setValue:[NSNumber numberWithFloat:duration]
- forKey:kCATransactionAnimationDuration];
- }
-
- ~ScopedCAActionSetDuration() {
- [CATransaction commit];
- }
-};
-
-} // namespace
-
// Given the number |n| of tiles with a desired aspect ratio of |a| and a
// desired distance |dx|, |dy| between tiles, returns how many tiles fit
// vertically into a rectangle with the dimensions |w_c|, |h_c|. This returns
« no previous file with comments | « chrome/browser/ui/cocoa/hover_close_button.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698