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

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: 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 15 matching lines...) Expand all
26 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 26 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
27 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" 27 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
28 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" 28 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
30 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
31 #include "grit/app_resources.h" 31 #include "grit/app_resources.h"
32 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
33 #include "skia/ext/skia_utils_mac.h" 33 #include "skia/ext/skia_utils_mac.h"
34 #include "third_party/skia/include/utils/mac/SkCGUtils.h" 34 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/image.h"
36 #include "ui/gfx/scoped_cg_context_state_mac.h" 37 #include "ui/gfx/scoped_cg_context_state_mac.h"
37 38
38 const int kTopGradientHeight = 15; 39 const int kTopGradientHeight = 15;
39 40
40 NSString* const kAnimationIdKey = @"AnimationId"; 41 NSString* const kAnimationIdKey = @"AnimationId";
41 NSString* const kAnimationIdFadeIn = @"FadeIn"; 42 NSString* const kAnimationIdFadeIn = @"FadeIn";
42 NSString* const kAnimationIdFadeOut = @"FadeOut"; 43 NSString* const kAnimationIdFadeOut = @"FadeOut";
43 44
44 const CGFloat kDefaultAnimationDuration = 0.25; // In seconds. 45 const CGFloat kDefaultAnimationDuration = 0.25; // In seconds.
45 const CGFloat kSlomoFactor = 4; 46 const CGFloat kSlomoFactor = 4;
(...skipping 1600 matching lines...) Expand 10 before | Expand all | Expand 10 after
1646 tile.set_tab_contents(contents->tab_contents()); 1647 tile.set_tab_contents(contents->tab_contents());
1647 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index]; 1648 ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
1648 [thumbLayer setTabContents:contents->tab_contents()]; 1649 [thumbLayer setTabContents:contents->tab_contents()];
1649 } 1650 }
1650 1651
1651 - (void)tabStripModelDeleted { 1652 - (void)tabStripModelDeleted {
1652 [self close]; 1653 [self close];
1653 } 1654 }
1654 1655
1655 @end 1656 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698