Merge 143605 - grd file update for new 2x assets

chrome/browser/upgrade_detector.cc

-// 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.
 
 #include "chrome/browser/upgrade_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/chrome_notification_types.h"
 #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).
 
 // How much idle time (since last input even was detected) must have passed
 // until we notify that a critical update has occurred.
 static const int kIdleAmount = 2;  // Hours (or seconds, if testing).
 
 bool UseTestingIntervals() {
   // If a command line parameter specifying how long the upgrade check should
@@ skipping 93 matching lines @@
       break;
     case IDLE_STATE_ACTIVE:
     case IDLE_STATE_UNKNOWN:
       break;
     default:
       NOTREACHED();  // Need to add any new value above (either providing
                      // automatic restart or show notification to user).
       break;
   }
 }