| OLD | NEW | 
|    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/page_info_model.h" |    5 #include "chrome/browser/page_info_model.h" | 
|    6  |    6  | 
|    7 #include <string> |    7 #include <string> | 
|    8  |    8  | 
|    9 #include "app/l10n_util.h" |    9 #include "app/l10n_util.h" | 
|   10 #include "app/resource_bundle.h" |   10 #include "app/resource_bundle.h" | 
|   11 #include "base/command_line.h" |   11 #include "base/command_line.h" | 
|   12 #include "base/i18n/time_formatting.h" |   12 #include "base/i18n/time_formatting.h" | 
|   13 #include "base/string_number_conversions.h" |   13 #include "base/string_number_conversions.h" | 
|   14 #include "base/utf_string_conversions.h" |   14 #include "base/utf_string_conversions.h" | 
|   15 #include "chrome/browser/cert_store.h" |   15 #include "chrome/browser/cert_store.h" | 
|   16 #include "chrome/browser/prefs/pref_service.h" |   16 #include "chrome/browser/prefs/pref_service.h" | 
|   17 #include "chrome/browser/profiles/profile.h" |   17 #include "chrome/browser/profiles/profile.h" | 
|   18 #include "chrome/browser/ssl/ssl_manager.h" |   18 #include "chrome/browser/ssl/ssl_manager.h" | 
|   19 #include "chrome/common/pref_names.h" |  | 
|   20 #include "grit/generated_resources.h" |   19 #include "grit/generated_resources.h" | 
|   21 #include "grit/theme_resources.h" |   20 #include "grit/theme_resources.h" | 
|   22 #include "net/base/cert_status_flags.h" |   21 #include "net/base/cert_status_flags.h" | 
|   23 #include "net/base/ssl_connection_status_flags.h" |   22 #include "net/base/ssl_connection_status_flags.h" | 
|   24 #include "net/base/ssl_cipher_suite_names.h" |   23 #include "net/base/ssl_cipher_suite_names.h" | 
|   25 #include "net/base/x509_certificate.h" |   24 #include "net/base/x509_certificate.h" | 
|   26  |   25  | 
|   27 #if defined(OS_MACOSX) |   26 #if defined(OS_MACOSX) | 
|   28 #include "base/mac/mac_util.h" |   27 #include "base/mac/mac_util.h" | 
|   29 #endif |   28 #endif | 
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  351 gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) { |  350 gfx::NativeImage PageInfoModel::GetBitmapNamed(int resource_id) { | 
|  352   ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |  351   ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 
|  353   gfx::NativeImage image = rb.GetNativeImageNamed(resource_id); |  352   gfx::NativeImage image = rb.GetNativeImageNamed(resource_id); | 
|  354 #if defined(OS_MACOSX) |  353 #if defined(OS_MACOSX) | 
|  355   // Unlike other platforms, the Mac ResourceBundle does not keep a shared image |  354   // Unlike other platforms, the Mac ResourceBundle does not keep a shared image | 
|  356   // cache. These are released in the dtor. |  355   // cache. These are released in the dtor. | 
|  357   base::mac::NSObjectRetain(image); |  356   base::mac::NSObjectRetain(image); | 
|  358 #endif |  357 #endif | 
|  359   return image; |  358   return image; | 
|  360 } |  359 } | 
| OLD | NEW |