diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:57:34 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-29 20:57:34 +0000 |
| commit | 29b25d090dda547a1b4340af1ad2a84cc498ab70 (patch) | |
| tree | 054230b7c8af03f95c3e77befc38aff6ba3dd67d /ui | |
| parent | 1e932118a2ad13c144f958e46899b535c7bc0bdd (diff) | |
| download | chromium_src-29b25d090dda547a1b4340af1ad2a84cc498ab70.zip chromium_src-29b25d090dda547a1b4340af1ad2a84cc498ab70.tar.gz chromium_src-29b25d090dda547a1b4340af1ad2a84cc498ab70.tar.bz2 | |
Move app/resources/* to ui/resources/ directory.
BUG=72317
TEST=None
R=rsesek@chromium.org
Review URL: http://codereview.chromium.org/7253057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/strings/ui_strings.gyp | 4 | ||||
| -rw-r--r-- | ui/gfx/test_suite.cc | 4 | ||||
| -rw-r--r-- | ui/resources/ui_resources.grd | 117 | ||||
| -rw-r--r-- | ui/ui.gyp | 1 | ||||
| -rw-r--r-- | ui/ui_resources.gypi | 31 |
5 files changed, 153 insertions, 4 deletions
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp index 55ef652..2fb2206 100644 --- a/ui/base/strings/ui_strings.gyp +++ b/ui/base/strings/ui_strings.gyp @@ -1,7 +1,7 @@ { 'variables': { 'chromium_code': 1, - 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui', }, 'targets': [ { @@ -70,7 +70,7 @@ { 'destination': '<(PRODUCT_DIR)/app_unittests_strings', 'files': [ - '<(grit_base_out_dir)/app_resources/app_resources.pak', + '<(grit_base_out_dir)/ui_resources/ui_resources.pak', ], }, ], diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc index cee5118..7c91b8a 100644 --- a/ui/gfx/test_suite.cc +++ b/ui/gfx/test_suite.cc @@ -44,8 +44,8 @@ void GfxTestSuite::Initialize() { pak_dir = pak_dir.AppendASCII("app_unittests_strings"); PathService::Override(ui::DIR_LOCALES, pak_dir); PathService::Override(ui::FILE_RESOURCES_PAK, - pak_dir.AppendASCII("app_resources.pak")); -#endif // OS_MACOSX + pak_dir.AppendASCII("ui_resources.pak")); +#endif // defined(OS_MACOSX) // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd new file mode 100644 index 0000000..95a23ed4 --- /dev/null +++ b/ui/resources/ui_resources.grd @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1"> + <outputs> + <output filename="grit/ui_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="ui_resources.pak" type="data_package" /> + <output filename="ui_resources.rc" type="rc_all" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> + <include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" /> + <include name="IDR_BROWSER_ACTION_BADGE_LEFT" file="browser_action_badge_left.png" type="BINDATA" /> + <include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" /> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_CLOSE" file="close.png" type="BINDATA" /> + <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" /> + <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" /> + <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" /> + <include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" /> + </if> + <include name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" /> + <include name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" /> + <include name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" /> + <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> + <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> + <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> + <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> + <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" /> + <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" /> + <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" /> + <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" /> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" /> + <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" /> + </if> + <include name="IDR_MENU_DROPARROW" file="menu_droparrow.png" type="BINDATA" /> + <include name="IDR_MENU_DROPARROW_SHARP" file="menu_droparrow_sharp.png" type="BINDATA" /> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" /> + <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_RESTORE" file="restore.png" type="BINDATA" /> + <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" /> + <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" /> + </if> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" /> + <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" /> + <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" /> + </if> + <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> + <if expr="not pp_ifdef('touchui')"> + <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" /> + </if> + <if expr="pp_ifdef('touchui')"> + <include name="IDR_THROBBER" file="large_throbber.png" type="BINDATA" /> + </if> + <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> + <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> + + <!-- Images only used by the Views toolkit. --> + <if expr="pp_ifdef('toolkit_views')"> + <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> + <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> + <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" /> + <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" /> + <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" /> + <include name="IDR_MENU_ARROW" file="menu_arrow.png" type="BINDATA" /> + <include name="IDR_MENU_CHECK" file="menu_check.png" type="BINDATA" /> + </if> + </includes> + </release> +</grit> @@ -52,6 +52,7 @@ 'includes': [ 'ui_base.gypi', 'ui_gfx.gypi', + 'ui_resources.gypi', ], 'conditions': [ ['toolkit_views2==1', { diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi new file mode 100644 index 0000000..3ee5ab6 --- /dev/null +++ b/ui/ui_resources.gypi @@ -0,0 +1,31 @@ +# 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. + +{ + 'targets': [ + { + 'target_name': 'ui_resources', + 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', + }, + 'actions': [ + { + 'action_name': 'ui_resources', + 'variables': { + 'grit_grd_file': 'resources/ui_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + ], + 'includes': [ '../build/grit_target.gypi' ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: |