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

Side by Side Diff: chrome/browser/ui/cocoa/tabpose_window.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some comments Created 9 years, 10 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 16 matching lines...) Expand all
27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
28 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 28 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
29 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" 29 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
30 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 30 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
31 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
32 #include "grit/app_resources.h" 32 #include "grit/app_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "skia/ext/skia_utils_mac.h" 34 #include "skia/ext/skia_utils_mac.h"
35 #include "third_party/skia/include/utils/mac/SkCGUtils.h" 35 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
36 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
37 #include "ui/gfx/image.h"
37 #include "ui/gfx/scoped_cg_context_state_mac.h" 38 #include "ui/gfx/scoped_cg_context_state_mac.h"
38 39
39 const int kTopGradientHeight = 15; 40 const int kTopGradientHeight = 15;
40 41
41 NSString* const kAnimationIdKey = @"AnimationId"; 42 NSString* const kAnimationIdKey = @"AnimationId";
42 NSString* const kAnimationIdFadeIn = @"FadeIn"; 43 NSString* const kAnimationIdFadeIn = @"FadeIn";
43 NSString* const kAnimationIdFadeOut = @"FadeOut"; 44 NSString* const kAnimationIdFadeOut = @"FadeOut";
44 45
45 const CGFloat kDefaultAnimationDuration = 0.25; // In seconds. 46 const CGFloat kDefaultAnimationDuration = 0.25; // In seconds.
46 const CGFloat kSlomoFactor = 4; 47 const CGFloat kSlomoFactor = 4;
(...skipping 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after
1654 tile.set_tab_contents(contents->tab_contents()); 1655 tile.set_tab_contents(contents->tab_contents());
1655 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index]; 1656 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
1656 [thumbLayer setTabContents:contents->tab_contents()]; 1657 [thumbLayer setTabContents:contents->tab_contents()];
1657 } 1658 }
1658 1659
1659 - (void)tabStripModelDeleted { 1660 - (void)tabStripModelDeleted {
1660 [self close]; 1661 [self close];
1661 } 1662 }
1662 1663
1663 @end 1664 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698