diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 16:28:46 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 16:28:46 +0000 |
| commit | d7a8ef643cd1a71bc7b84bbb7872af9b67c09a8e (patch) | |
| tree | cd3e11e29e74205af4d438403fe26f67c515f808 /chrome/browser/upgrade_detector.cc | |
| parent | 661b4e494abfc10d0d5fd0ea165170983dad97f5 (diff) | |
| download | chromium_src-d7a8ef643cd1a71bc7b84bbb7872af9b67c09a8e.zip chromium_src-d7a8ef643cd1a71bc7b84bbb7872af9b67c09a8e.tar.gz chromium_src-d7a8ef643cd1a71bc7b84bbb7872af9b67c09a8e.tar.bz2 | |
grd file update for new 2x assets
The grd changes were made by http://pastie.org/4132407 (and
then cleaned up manually).
BUG=132910
TEST=Look at various icons (blocked plugins, "press tab to search", etc)
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10642014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/upgrade_detector.cc')
| -rw-r--r-- | chrome/browser/upgrade_detector.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index 2544d59..c3c498b 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -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). |