diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 22:13:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 22:13:55 +0000 |
| commit | 09dd31796a3164c6564c900586194aec7957189d (patch) | |
| tree | 397c47f1d45b06a029df9a53b069efa26600f016 /ui/base | |
| parent | 60d0673db91e7805394654019217319b7849ea56 (diff) | |
| download | chromium_src-09dd31796a3164c6564c900586194aec7957189d.zip chromium_src-09dd31796a3164c6564c900586194aec7957189d.tar.gz chromium_src-09dd31796a3164c6564c900586194aec7957189d.tar.bz2 | |
Rename _large.grd to _2x.grd
BUG=111101
TEST=none
Review URL: http://codereview.chromium.org/9307110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 2 | ||||
| -rw-r--r-- | ui/base/resource/resource_bundle_posix.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 1fb7bd6..dd890d0 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -50,7 +50,7 @@ FilePath ResourceBundle::GetResourcesFilePath() { FilePath ResourceBundle::GetLargeIconResourcesFilePath() { // Only load the large resource pak when running on 10.7 or later. if (base::mac::IsOSLionOrLater()) - return GetResourcesPakFilePath(@"theme_resources_large", nil); + return GetResourcesPakFilePath(@"theme_resources_2x", nil); else return FilePath(); } diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index ec4e7ac..184f7b2 100644 --- a/ui/base/resource/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.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. @@ -60,7 +60,7 @@ void ResourceBundle::LoadCommonResources() { large_icon_resources_data_ = LoadResourcesDataPak(large_icon_resources_file_path); CHECK(large_icon_resources_data_) << - "failed to load theme_resources_large.pak"; + "failed to load theme_resources_2x.pak"; } } |