diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 15:35:21 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 15:35:21 +0000 |
| commit | 75cbdc7da7309a46d017a8885f31ad0f88b4665a (patch) | |
| tree | af2dc6f6d53a3af99409bbb93560f867b4b67154 /chrome/browser/profiles | |
| parent | ece3fc36be19686c147db78d2109c79b664d5f6d (diff) | |
| download | chromium_src-75cbdc7da7309a46d017a8885f31ad0f88b4665a.zip chromium_src-75cbdc7da7309a46d017a8885f31ad0f88b4665a.tar.gz chromium_src-75cbdc7da7309a46d017a8885f31ad0f88b4665a.tar.bz2 | |
Revert 143171 - 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
TBR=avi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10573030
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -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 1885d4e..347254d 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_standard.h" +#include "grit/theme_resources.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 3d959df..0f291ac 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) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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_standard.h" +#include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_unittest_util.h" |