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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/balloon_controller.mm

Issue 5961007: Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update c... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 12 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" 5 #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/mac/nsimage_cache.h"
8 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
9 #import "base/cocoa_protocols_mac.h" 10 #import "base/cocoa_protocols_mac.h"
10 #include "base/mac_util.h" 11 #include "base/mac_util.h"
11 #include "base/nsimage_cache_mac.h"
12 #import "base/scoped_nsobject.h" 12 #import "base/scoped_nsobject.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/notifications/balloon.h" 14 #include "chrome/browser/notifications/balloon.h"
15 #include "chrome/browser/notifications/desktop_notification_service.h" 15 #include "chrome/browser/notifications/desktop_notification_service.h"
16 #include "chrome/browser/notifications/notification.h" 16 #include "chrome/browser/notifications/notification.h"
17 #include "chrome/browser/notifications/notification_options_menu_model.h" 17 #include "chrome/browser/notifications/notification_options_menu_model.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/renderer_host/render_view_host.h" 19 #include "chrome/browser/renderer_host/render_view_host.h"
20 #import "chrome/browser/ui/cocoa/hover_image_button.h" 20 #import "chrome/browser/ui/cocoa/hover_image_button.h"
21 #import "chrome/browser/ui/cocoa/menu_controller.h" 21 #import "chrome/browser/ui/cocoa/menu_controller.h"
(...skipping 30 matching lines...) Expand all
52 menuController_.reset([[MenuController alloc] initWithModel:menuModel_.get() 52 menuController_.reset([[MenuController alloc] initWithModel:menuModel_.get()
53 useWithPopUpButtonCell:NO]); 53 useWithPopUpButtonCell:NO]);
54 } 54 }
55 return self; 55 return self;
56 } 56 }
57 57
58 - (void)awakeFromNib { 58 - (void)awakeFromNib {
59 DCHECK([self window]); 59 DCHECK([self window]);
60 DCHECK_EQ(self, [[self window] delegate]); 60 DCHECK_EQ(self, [[self window] delegate]);
61 61
62 NSImage* image = nsimage_cache::ImageNamed(@"balloon_wrench.pdf"); 62 NSImage* image = app::mac::GetCachedImageWithName(@"balloon_wrench.pdf");
63 [optionsButton_ setDefaultImage:image]; 63 [optionsButton_ setDefaultImage:image];
64 [optionsButton_ setDefaultOpacity:0.6]; 64 [optionsButton_ setDefaultOpacity:0.6];
65 [optionsButton_ setHoverImage:image]; 65 [optionsButton_ setHoverImage:image];
66 [optionsButton_ setHoverOpacity:0.9]; 66 [optionsButton_ setHoverOpacity:0.9];
67 [optionsButton_ setPressedImage:image]; 67 [optionsButton_ setPressedImage:image];
68 [optionsButton_ setPressedOpacity:1.0]; 68 [optionsButton_ setPressedOpacity:1.0];
69 [[optionsButton_ cell] setHighlightsBy:NSNoCellMask]; 69 [[optionsButton_ cell] setHighlightsBy:NSNoCellMask];
70 70
71 NSString* sourceLabelText = l10n_util::GetNSStringF( 71 NSString* sourceLabelText = l10n_util::GetNSStringF(
72 IDS_NOTIFICATION_BALLOON_SOURCE_LABEL, 72 IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 htmlContents_.reset(new BalloonViewHost(balloon_)); 232 htmlContents_.reset(new BalloonViewHost(balloon_));
233 htmlContents_->Init(); 233 htmlContents_->Init();
234 } 234 }
235 235
236 // NSWindowDelegate notification. 236 // NSWindowDelegate notification.
237 - (void)windowWillClose:(NSNotification*)notif { 237 - (void)windowWillClose:(NSNotification*)notif {
238 [self autorelease]; 238 [self autorelease];
239 } 239 }
240 240
241 @end 241 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm ('k') | chrome/browser/ui/cocoa/nsimage_cache_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698