Merge 143605 - grd file update for new 2x assets

chrome/browser/page_info_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/page_info_model.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/page_info_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::SSLStatus;
 
 PageInfoModel::PageInfoModel(Profile* profile,
@@ skipping 326 matching lines @@
   // Loads the icons into the vector. The order must match the SectionStateIcon
   // enum.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_GOOD));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MINOR));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MAJOR));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_BAD));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_INFO));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_26));
 }