diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 21:23:14 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 21:23:14 +0000 |
| commit | a2c623ff2deea40869f8fdc44bad435caeae46fc (patch) | |
| tree | 79edcac889896b9ca9d5b04a3facca13571d77a2 /chrome/browser | |
| parent | 1c88fde629cf940c178654964d4785140f20b7f3 (diff) | |
| download | chromium_src-a2c623ff2deea40869f8fdc44bad435caeae46fc.zip chromium_src-a2c623ff2deea40869f8fdc44bad435caeae46fc.tar.gz chromium_src-a2c623ff2deea40869f8fdc44bad435caeae46fc.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/10629006
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/profiles/profile_info_cache.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile_info_util_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index 347254d..1885d4e 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -25,7 +25,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" -#include "grit/theme_resources.h" +#include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" 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" |