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

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

Issue 10829184: Remove a few unneeded includes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 #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 #import <AppKit/AppKit.h>
8
9 #include "base/mac/mac_util.h"
10 #include "chrome/browser/favicon/favicon_tab_helper.h" 7 #include "chrome/browser/favicon/favicon_tab_helper.h"
11 #include "chrome/browser/ui/tab_contents/tab_contents.h" 8 #include "chrome/browser/ui/tab_contents/tab_contents.h"
12 #include "grit/ui_resources.h" 9 #include "grit/ui_resources.h"
13 #include "skia/ext/skia_utils_mac.h"
14 #include "third_party/skia/include/core/SkBitmap.h"
15 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/mac/nsimage_cache.h"
17 11
18 namespace mac { 12 namespace mac {
19 13
20 NSImage* FaviconForTabContents(TabContents* contents) { 14 NSImage* FaviconForTabContents(TabContents* contents) {
21 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) { 15 if (contents && contents->favicon_tab_helper()->FaviconIsValid()) {
22 NSImage* image = contents->favicon_tab_helper()->GetFavicon().ToNSImage(); 16 NSImage* image = contents->favicon_tab_helper()->GetFavicon().ToNSImage();
23 // 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
24 // to the default image. 18 // to the default image.
25 if (image) { 19 if (image) {
26 return image; 20 return image;
27 } 21 }
28 } 22 }
29 23
30 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 24 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
31 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON); 25 return rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
32 } 26 }
33 27
34 } // namespace mac 28 } // namespace mac
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698