diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 14:43:36 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 14:43:36 +0000 |
| commit | 0a322d4bb8f00204d8d4714cd33bb5bfc7442988 (patch) | |
| tree | 21fe5aaa1de374e976708ada7dd3e9d8fdaced06 /chrome/browser/profiles/profile_info_util_unittest.cc | |
| parent | 2d2bef5824d7ff1a164361100f4a61b9e5be160f (diff) | |
| download | chromium_src-0a322d4bb8f00204d8d4714cd33bb5bfc7442988.zip chromium_src-0a322d4bb8f00204d8d4714cd33bb5bfc7442988.tar.gz chromium_src-0a322d4bb8f00204d8d4714cd33bb5bfc7442988.tar.bz2 | |
Merge 143074 - Make avatar images HiDPI.
BUG=133542
TEST=as in bug
Review URL: https://chromiumcodereview.appspot.com/10584022
TBR=avi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10574042
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_info_util_unittest.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_info_util_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_info_util_unittest.cc b/chrome/browser/profiles/profile_info_util_unittest.cc index 0f291ac..3d959df 100644 --- a/chrome/browser/profiles/profile_info_util_unittest.cc +++ b/chrome/browser/profiles/profile_info_util_unittest.cc @@ -1,11 +1,11 @@ -// 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/profiles/profile_info_util.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_unittest_util.h" |