Merge 143605 - grd file update for new 2x assets

chrome/browser/upgrade_detector.cc

Index: chrome/browser/upgrade_detector.cc
===================================================================
--- chrome/browser/upgrade_detector.cc	(revision 143847)
+++ chrome/browser/upgrade_detector.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,7 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
-#include "grit/theme_resources.h"
+#include "grit/theme_resources_standard.h"
 
 // How long to wait between checks for whether the user has been idle.
 static const int kIdleRepeatingTimerWait = 10;  // Minutes (seconds if testing).