Skip to content

GitLab

T
tangled
Commit 09dd3179 authored by thakis@chromium.org's avatar thakis@chromium.org
Browse files
Options

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
parent 60d0673d
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
chrome/app/theme/theme_resources_large.grd → chrome/app/theme/theme_resources_2x.grd
View file @ 09dd3179
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/theme_resources_large.h" type="rc_header">
<output filename="grit/theme_resources_2x.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="theme_resources_large.pak" type="data_package" />
<output filename="theme_resources_2x.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
......
chrome/app/theme/theme_resources_standard.grd
View file @ 09dd3179
......@@ -12,7 +12,7 @@
<release seq="1">
<includes>
<!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
theme_resources_large.grd. THIS MEANS THAT EACH ICON IN THIS FILE
theme_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE
MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
<include name="IDR_APP_NOTIFICATION_NUB" file="nub.png" type="BINDATA" />
<include name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" type="BINDATA" />
......
chrome/chrome_browser.gypi
View file @ 09dd3179
......@@ -53,7 +53,7 @@
'../ui/gfx/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
'../ui/ui.gyp:ui_resources_large',
'../ui/ui.gyp:ui_resources_2x',
'../ui/ui.gyp:ui_resources_standard',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:appcache',
......
chrome/chrome_dll.gypi
View file @ 09dd3179
......@@ -347,7 +347,7 @@
},
'actions': [
{
'includes': ['chrome_repack_theme_resources_large.gypi']
'includes': ['chrome_repack_theme_resources_2x.gypi']
},
],
'postbuilds': [
......
chrome/chrome_repack_theme_resources_large.gypi → chrome/chrome_repack_theme_resources_2x.gypi
View file @ 09dd3179
# 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.
{
'action_name': 'repack_theme_resources_large',
'action_name': 'repack_theme_resources_2x',
'variables': {
'pak_inputs': [
'<(grit_out_dir)/theme_resources_large.pak',
'<(grit_out_dir)/theme_resources_2x.pak',
],
},
'inputs': [
......@@ -13,7 +13,7 @@
'<@(pak_inputs)',
],
'outputs': [
'<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
'<(INTERMEDIATE_DIR)/repack/theme_resources_2x.pak',
],
'action': ['python', '<(repack_path)', '<@(_outputs)',
'<@(pak_inputs)'],
......
chrome/chrome_resources.gyp
View file @ 09dd3179
......@@ -211,9 +211,9 @@
'includes': [ '../build/grit_action.gypi' ],
},
{
'action_name': 'theme_resources_large',
'action_name': 'theme_resources_2x',
'variables': {
'grit_grd_file': 'app/theme/theme_resources_large.grd',
'grit_grd_file': 'app/theme/theme_resources_2x.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
......@@ -274,7 +274,7 @@
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/ui.gyp:gfx_resources',
'<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/ui/ui.gyp:ui_resources_large',
'<(DEPTH)/ui/ui.gyp:ui_resources_2x',
'<(DEPTH)/ui/ui.gyp:ui_resources_standard',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
......
tools/gritsettings/resource_ids
View file @ 09dd3179
......@@ -143,7 +143,7 @@
"chrome/app/theme/theme_resources_standard.grd": {
"includes": [21000],
},
"chrome/app/theme/theme_resources_large.grd": {
"chrome/app/theme/theme_resources_2x.grd": {
"includes": [21000],
},
# This file is generated during the build.
......@@ -169,7 +169,7 @@
"ui/resources/ui_resources_standard.grd": {
"includes": [24000],
},
"ui/resources/ui_resources_large.grd": {
"ui/resources/ui_resources_2x.grd": {
"includes": [24000],
},
"content/content_resources.grd": {
......
ui/base/resource/resource_bundle_mac.mm
View file @ 09dd3179
......@@ -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();
}
......
ui/base/resource/resource_bundle_posix.cc
View file @ 09dd3179
// 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";
}
}
......
ui/resources/ui_resources_large.grd → ui/resources/ui_resources_2x.grd
View file @ 09dd3179
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/ui_resources_large.h" type="rc_header">
<output filename="grit/ui_resources_2x.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="grit/ui_resources_large_map.cc" type="resource_map_source" />
<output filename="grit/ui_resources_large_map.h" type="resource_map_header" />
<output filename="ui_resources_large.pak" type="data_package" />
<output filename="ui_resources_large.rc" type="rc_all" />
<output filename="grit/ui_resources_2x_map.cc" type="resource_map_source" />
<output filename="grit/ui_resources_2x_map.h" type="resource_map_header" />
<output filename="ui_resources_2x.pak" type="data_package" />
<output filename="ui_resources_2x.rc" type="rc_all" />
</outputs>
<release seq="1">
<includes>
......
ui/resources/ui_resources_standard.grd
View file @ 09dd3179
......@@ -12,7 +12,7 @@
<release seq="1">
<includes>
<!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH
ui_resources_large.grd. THIS MEANS THAT EACH ICON IN THIS FILE
ui_resources_2x.grd. THIS MEANS THAT EACH ICON IN THIS FILE
MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->
<include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
<include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
......
ui/ui_resources.gypi
View file @ 09dd3179
# 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.
......@@ -22,16 +22,16 @@
'includes': [ '../build/grit_target.gypi' ],
},
{
'target_name': 'ui_resources_large',
'target_name': 'ui_resources_2x',
'type': 'none',
'variables': {
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large',
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x',
},
'actions': [
{
'action_name': 'ui_resources_large',
'action_name': 'ui_resources_2x',
'variables': {
'grit_grd_file': 'resources/ui_resources_large.grd',
'grit_grd_file': 'resources/ui_resources_2x.grd',
},
'includes': [ '../build/grit_action.gypi' ],
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment