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

Side by Side Diff: chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments and merge Created 8 years, 3 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
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 #include "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" 5 #include "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"
6 6
7 #include "chrome/browser/favicon/favicon_tab_helper.h" 7 #include "chrome/browser/favicon/favicon_tab_helper.h"
8 #include "chrome/browser/ui/tab_contents/tab_contents.h" 8 #include "chrome/browser/ui/tab_contents/tab_contents.h"
9 #include "grit/ui_resources.h" 9 #include "grit/ui_resources.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 11
12 namespace mac { 12 namespace mac {
13 13
14 NSImage* FaviconForTabContents(TabContents* contents) { 14 NSImage* FaviconForTabContents(TabContents* contents) {
15 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { 15 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {
16 NSImage* image = contents->favicon_tab_helper()->GetFavicon().AsNSImage(); 16 NSImage* image = contents->favicon_tab_helper()->GetFavicon().AsNSImage();
17 // The |image| could be nil if the bitmap is null. In that case, fallback 17 // The |image| could be nil if the bitmap is null. In that case, fallback
18 // to the default image. 18 // to the default image.
19 if (image) { 19 if (image) {
20 return image; 20 return image;
21 } 21 }
22 } 22 }
23 23
24 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 24 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
25 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON); 25 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON).ToNSImage();
26 } 26 }
27 27
28 } // namespace mac 28 } // namespace mac
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/speech_recognition_window_controller.mm ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698