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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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) 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 #ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_
6 #define CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_ 6 #define CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h" 12 #include "chrome/browser/ui/cocoa/tabs/throbbing_image_view.h"
13 13
14 // ImageView for when a tab is in "projecting" mode. The view is made up of 14 // ImageView for when a tab is in "projecting" mode. The view is made up of
15 // three images: background image (original favicon), projector sheet and an 15 // three images: background image (original favicon), projector sheet and an
16 // animated glow. This view paints outside the favicon bounds due to the glow. 16 // animated glow. This view paints outside the favicon bounds due to the glow.
17 @interface TabProjectingImageView : ThrobbingImageView { 17 @interface TabProjectingImageView : ThrobbingImageView {
18 @private 18 @private
19 scoped_nsobject<NSImage> projectorImage_; 19 base::scoped_nsobject<NSImage> projectorImage_;
20 } 20 }
21 21
22 - (id)initWithFrame:(NSRect)rect 22 - (id)initWithFrame:(NSRect)rect
23 backgroundImage:(NSImage*)backgroundImage 23 backgroundImage:(NSImage*)backgroundImage
24 projectorImage:(NSImage*)projectorImage 24 projectorImage:(NSImage*)projectorImage
25 throbImage:(NSImage*)throbImage 25 throbImage:(NSImage*)throbImage
26 durationMS:(int)durationMS 26 durationMS:(int)durationMS
27 animationContainer:(ui::AnimationContainer*)animationContainer; 27 animationContainer:(ui::AnimationContainer*)animationContainer;
28 28
29 @end 29 @end
30 30
31 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_ 31 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_PROJECTING_IMAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698