Merge 143605 - grd file update for new 2x assets

chrome/browser/protector/homepage_change.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 "base/basictypes.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_prefs_change.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
 
 // Homepage change tracked by Protector.
 class HomepageChange : public BasePrefsChange {
  public:
   // Enum for reporting UMA statistics.
   enum HomepageType {
     HOMEPAGE_NTP = 0,
@@ skipping 166 matching lines @@
     bool actual_show_homepage,
     const std::string& backup_homepage,
     bool backup_homepage_is_ntp,
     bool backup_show_homepage) {
   return new HomepageChange(
       actual_homepage, actual_homepage_is_ntp, actual_show_homepage,
       backup_homepage, backup_homepage_is_ntp, backup_show_homepage);
 }
 
 }  // namespace protector