diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:33:38 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:33:38 +0000 |
| commit | 7b3aa961e8905b04fbe185f85a78a4b6b241ea5d (patch) | |
| tree | 45ac7aedca9bcb546559707d246f971219a41f22 | |
| parent | 679092e9bebd5696e633967caa22399086e51ea3 (diff) | |
| download | chromium_src-7b3aa961e8905b04fbe185f85a78a4b6b241ea5d.zip chromium_src-7b3aa961e8905b04fbe185f85a78a4b6b241ea5d.tar.gz chromium_src-7b3aa961e8905b04fbe185f85a78a4b6b241ea5d.tar.bz2 | |
Bustage fix:
Add back these files which I removed earlier since Linux is using them.
The resources are duplicate until I collapse them into src/app/ later this week.
Review URL: http://codereview.chromium.org/100320
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15182 0039d316-1c4b-4281-b951-d872f2087c98
79 files changed, 238 insertions, 174 deletions
diff --git a/chrome/app/theme/app_top_center.png b/chrome/app/theme/app_top_center.png Binary files differnew file mode 100644 index 0000000..863ff19 --- /dev/null +++ b/chrome/app/theme/app_top_center.png diff --git a/chrome/app/theme/app_top_left.png b/chrome/app/theme/app_top_left.png Binary files differnew file mode 100644 index 0000000..79723bc --- /dev/null +++ b/chrome/app/theme/app_top_left.png diff --git a/chrome/app/theme/app_top_right.png b/chrome/app/theme/app_top_right.png Binary files differnew file mode 100644 index 0000000..b00c3ea --- /dev/null +++ b/chrome/app/theme/app_top_right.png diff --git a/chrome/app/theme/close.png b/chrome/app/theme/close.png Binary files differnew file mode 100644 index 0000000..6217569 --- /dev/null +++ b/chrome/app/theme/close.png diff --git a/chrome/app/theme/close_h.png b/chrome/app/theme/close_h.png Binary files differnew file mode 100644 index 0000000..9921435 --- /dev/null +++ b/chrome/app/theme/close_h.png diff --git a/chrome/app/theme/close_p.png b/chrome/app/theme/close_p.png Binary files differnew file mode 100644 index 0000000..0487e4a --- /dev/null +++ b/chrome/app/theme/close_p.png diff --git a/chrome/app/theme/close_sa.png b/chrome/app/theme/close_sa.png Binary files differnew file mode 100644 index 0000000..12ae813 --- /dev/null +++ b/chrome/app/theme/close_sa.png diff --git a/chrome/app/theme/close_sa_h.png b/chrome/app/theme/close_sa_h.png Binary files differnew file mode 100644 index 0000000..d5a7a42 --- /dev/null +++ b/chrome/app/theme/close_sa_h.png diff --git a/chrome/app/theme/close_sa_p.png b/chrome/app/theme/close_sa_p.png Binary files differnew file mode 100644 index 0000000..c1d7c91 --- /dev/null +++ b/chrome/app/theme/close_sa_p.png diff --git a/chrome/app/theme/content_bottom_center.png b/chrome/app/theme/content_bottom_center.png Binary files differnew file mode 100644 index 0000000..a9bdb3d --- /dev/null +++ b/chrome/app/theme/content_bottom_center.png diff --git a/chrome/app/theme/content_bottom_left_corner.png b/chrome/app/theme/content_bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..0f0d629 --- /dev/null +++ b/chrome/app/theme/content_bottom_left_corner.png diff --git a/chrome/app/theme/content_bottom_right_corner.png b/chrome/app/theme/content_bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..77fe4ac --- /dev/null +++ b/chrome/app/theme/content_bottom_right_corner.png diff --git a/chrome/app/theme/content_left_side.png b/chrome/app/theme/content_left_side.png Binary files differnew file mode 100644 index 0000000..e952fcb --- /dev/null +++ b/chrome/app/theme/content_left_side.png diff --git a/chrome/app/theme/content_right_side.png b/chrome/app/theme/content_right_side.png Binary files differnew file mode 100644 index 0000000..35e3d74 --- /dev/null +++ b/chrome/app/theme/content_right_side.png diff --git a/chrome/app/theme/dewindow_bottom_center.png b/chrome/app/theme/dewindow_bottom_center.png Binary files differnew file mode 100644 index 0000000..78c0409 --- /dev/null +++ b/chrome/app/theme/dewindow_bottom_center.png diff --git a/chrome/app/theme/dewindow_bottom_left_corner.png b/chrome/app/theme/dewindow_bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..d961eaf --- /dev/null +++ b/chrome/app/theme/dewindow_bottom_left_corner.png diff --git a/chrome/app/theme/dewindow_bottom_right_corner.png b/chrome/app/theme/dewindow_bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..e5a2e3d --- /dev/null +++ b/chrome/app/theme/dewindow_bottom_right_corner.png diff --git a/chrome/app/theme/dewindow_left_side.png b/chrome/app/theme/dewindow_left_side.png Binary files differnew file mode 100644 index 0000000..f84abc3 --- /dev/null +++ b/chrome/app/theme/dewindow_left_side.png diff --git a/chrome/app/theme/dewindow_right_side.png b/chrome/app/theme/dewindow_right_side.png Binary files differnew file mode 100644 index 0000000..3e79e27 --- /dev/null +++ b/chrome/app/theme/dewindow_right_side.png diff --git a/chrome/app/theme/dewindow_top_center.png b/chrome/app/theme/dewindow_top_center.png Binary files differnew file mode 100644 index 0000000..6a5ba27 --- /dev/null +++ b/chrome/app/theme/dewindow_top_center.png diff --git a/chrome/app/theme/dewindow_top_left_corner.png b/chrome/app/theme/dewindow_top_left_corner.png Binary files differnew file mode 100644 index 0000000..d7af76f --- /dev/null +++ b/chrome/app/theme/dewindow_top_left_corner.png diff --git a/chrome/app/theme/dewindow_top_right_corner.png b/chrome/app/theme/dewindow_top_right_corner.png Binary files differnew file mode 100644 index 0000000..ca6659c --- /dev/null +++ b/chrome/app/theme/dewindow_top_right_corner.png diff --git a/chrome/app/theme/folder_closed.png b/chrome/app/theme/folder_closed.png Binary files differnew file mode 100644 index 0000000..746fab9 --- /dev/null +++ b/chrome/app/theme/folder_closed.png diff --git a/chrome/app/theme/folder_closed_rtl.png b/chrome/app/theme/folder_closed_rtl.png Binary files differnew file mode 100644 index 0000000..dbd0b0a --- /dev/null +++ b/chrome/app/theme/folder_closed_rtl.png diff --git a/chrome/app/theme/folder_open.png b/chrome/app/theme/folder_open.png Binary files differnew file mode 100644 index 0000000..3276810 --- /dev/null +++ b/chrome/app/theme/folder_open.png diff --git a/chrome/app/theme/folder_open_rtl.png b/chrome/app/theme/folder_open_rtl.png Binary files differnew file mode 100644 index 0000000..9ba7069 --- /dev/null +++ b/chrome/app/theme/folder_open_rtl.png diff --git a/chrome/app/theme/input_alert.png b/chrome/app/theme/input_alert.png Binary files differnew file mode 100644 index 0000000..503a545 --- /dev/null +++ b/chrome/app/theme/input_alert.png diff --git a/chrome/app/theme/input_good.png b/chrome/app/theme/input_good.png Binary files differnew file mode 100644 index 0000000..1646cd5 --- /dev/null +++ b/chrome/app/theme/input_good.png diff --git a/chrome/app/theme/input_unknown.png b/chrome/app/theme/input_unknown.png Binary files differnew file mode 100644 index 0000000..0a5484d --- /dev/null +++ b/chrome/app/theme/input_unknown.png diff --git a/chrome/app/theme/maximize.png b/chrome/app/theme/maximize.png Binary files differnew file mode 100644 index 0000000..5fb89e2 --- /dev/null +++ b/chrome/app/theme/maximize.png diff --git a/chrome/app/theme/maximize_h.png b/chrome/app/theme/maximize_h.png Binary files differnew file mode 100644 index 0000000..ab326b1 --- /dev/null +++ b/chrome/app/theme/maximize_h.png diff --git a/chrome/app/theme/maximize_p.png b/chrome/app/theme/maximize_p.png Binary files differnew file mode 100644 index 0000000..6c92c75 --- /dev/null +++ b/chrome/app/theme/maximize_p.png diff --git a/chrome/app/theme/minimize.png b/chrome/app/theme/minimize.png Binary files differnew file mode 100644 index 0000000..fe0ab2f --- /dev/null +++ b/chrome/app/theme/minimize.png diff --git a/chrome/app/theme/minimize_h.png b/chrome/app/theme/minimize_h.png Binary files differnew file mode 100644 index 0000000..6bceb24 --- /dev/null +++ b/chrome/app/theme/minimize_h.png diff --git a/chrome/app/theme/minimize_p.png b/chrome/app/theme/minimize_p.png Binary files differnew file mode 100644 index 0000000..62b2f77 --- /dev/null +++ b/chrome/app/theme/minimize_p.png diff --git a/chrome/app/theme/restore.png b/chrome/app/theme/restore.png Binary files differnew file mode 100644 index 0000000..bb70f2d --- /dev/null +++ b/chrome/app/theme/restore.png diff --git a/chrome/app/theme/restore_h.png b/chrome/app/theme/restore_h.png Binary files differnew file mode 100644 index 0000000..96851ef --- /dev/null +++ b/chrome/app/theme/restore_h.png diff --git a/chrome/app/theme/restore_p.png b/chrome/app/theme/restore_p.png Binary files differnew file mode 100644 index 0000000..96851ef --- /dev/null +++ b/chrome/app/theme/restore_p.png diff --git a/chrome/app/theme/textbutton_b_h.png b/chrome/app/theme/textbutton_b_h.png Binary files differnew file mode 100644 index 0000000..169db96 --- /dev/null +++ b/chrome/app/theme/textbutton_b_h.png diff --git a/chrome/app/theme/textbutton_b_p.png b/chrome/app/theme/textbutton_b_p.png Binary files differnew file mode 100644 index 0000000..f1fb512 --- /dev/null +++ b/chrome/app/theme/textbutton_b_p.png diff --git a/chrome/app/theme/textbutton_bl_h.png b/chrome/app/theme/textbutton_bl_h.png Binary files differnew file mode 100644 index 0000000..f45f0e8 --- /dev/null +++ b/chrome/app/theme/textbutton_bl_h.png diff --git a/chrome/app/theme/textbutton_bl_p.png b/chrome/app/theme/textbutton_bl_p.png Binary files differnew file mode 100644 index 0000000..06712be --- /dev/null +++ b/chrome/app/theme/textbutton_bl_p.png diff --git a/chrome/app/theme/textbutton_br_h.png b/chrome/app/theme/textbutton_br_h.png Binary files differnew file mode 100644 index 0000000..e8f3b1f --- /dev/null +++ b/chrome/app/theme/textbutton_br_h.png diff --git a/chrome/app/theme/textbutton_br_p.png b/chrome/app/theme/textbutton_br_p.png Binary files differnew file mode 100644 index 0000000..a84c385 --- /dev/null +++ b/chrome/app/theme/textbutton_br_p.png diff --git a/chrome/app/theme/textbutton_c_h.png b/chrome/app/theme/textbutton_c_h.png Binary files differnew file mode 100644 index 0000000..6188590 --- /dev/null +++ b/chrome/app/theme/textbutton_c_h.png diff --git a/chrome/app/theme/textbutton_c_p.png b/chrome/app/theme/textbutton_c_p.png Binary files differnew file mode 100644 index 0000000..2925888 --- /dev/null +++ b/chrome/app/theme/textbutton_c_p.png diff --git a/chrome/app/theme/textbutton_l_h.png b/chrome/app/theme/textbutton_l_h.png Binary files differnew file mode 100644 index 0000000..4e3b7ab --- /dev/null +++ b/chrome/app/theme/textbutton_l_h.png diff --git a/chrome/app/theme/textbutton_l_p.png b/chrome/app/theme/textbutton_l_p.png Binary files differnew file mode 100644 index 0000000..8641049 --- /dev/null +++ b/chrome/app/theme/textbutton_l_p.png diff --git a/chrome/app/theme/textbutton_r_h.png b/chrome/app/theme/textbutton_r_h.png Binary files differnew file mode 100644 index 0000000..946c5ef --- /dev/null +++ b/chrome/app/theme/textbutton_r_h.png diff --git a/chrome/app/theme/textbutton_r_p.png b/chrome/app/theme/textbutton_r_p.png Binary files differnew file mode 100644 index 0000000..e4f7f34 --- /dev/null +++ b/chrome/app/theme/textbutton_r_p.png diff --git a/chrome/app/theme/textbutton_t_h.png b/chrome/app/theme/textbutton_t_h.png Binary files differnew file mode 100644 index 0000000..11285e0 --- /dev/null +++ b/chrome/app/theme/textbutton_t_h.png diff --git a/chrome/app/theme/textbutton_t_p.png b/chrome/app/theme/textbutton_t_p.png Binary files differnew file mode 100644 index 0000000..c212b4f --- /dev/null +++ b/chrome/app/theme/textbutton_t_p.png diff --git a/chrome/app/theme/textbutton_tl_h.png b/chrome/app/theme/textbutton_tl_h.png Binary files differnew file mode 100644 index 0000000..51208bc --- /dev/null +++ b/chrome/app/theme/textbutton_tl_h.png diff --git a/chrome/app/theme/textbutton_tl_p.png b/chrome/app/theme/textbutton_tl_p.png Binary files differnew file mode 100644 index 0000000..6422023 --- /dev/null +++ b/chrome/app/theme/textbutton_tl_p.png diff --git a/chrome/app/theme/textbutton_tr_h.png b/chrome/app/theme/textbutton_tr_h.png Binary files differnew file mode 100644 index 0000000..f07e92ff --- /dev/null +++ b/chrome/app/theme/textbutton_tr_h.png diff --git a/chrome/app/theme/textbutton_tr_p.png b/chrome/app/theme/textbutton_tr_p.png Binary files differnew file mode 100644 index 0000000..ab87ec6 --- /dev/null +++ b/chrome/app/theme/textbutton_tr_p.png diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj index 8a8efeb..1ec5d14 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -143,10 +143,6 @@ RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc" > </File> - <File - RelativePath="$(OutDir)\grit_derived_sources\views_resources.rc" - > - </File> </Files> <Globals> </Globals> diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 2550d70..f64b32b 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -295,6 +295,74 @@ <include name="IDR_WIZARD_ICON_RTL" file="chromium/wizard_icon_rtl.png" type="BINDATA" /> <include name="IDR_PRODUCT_ICON_32" file="chromium/chromium_icon_32.png" type="BINDATA" /> </if> + + + <!-- TODO(beng): remove these duplicates with views_resources --> + <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" /> + <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_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" /> + <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" /> + <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" /> + <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" /> + <include name="IDR_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" /> + <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" /> + <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> + <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> + <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> + <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_THROBBER" file="throbber.png" type="BINDATA" /> + <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" /> + <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> + <include name="IDR_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" /> + <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> + <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> + <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> + <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_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_P" file="textbutton_tr_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> + <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.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_P" file="textbutton_br_p.png" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/app/theme/throbber.png b/chrome/app/theme/throbber.png Binary files differnew file mode 100644 index 0000000..6ca1fdd --- /dev/null +++ b/chrome/app/theme/throbber.png diff --git a/chrome/app/theme/window_bottom_center.png b/chrome/app/theme/window_bottom_center.png Binary files differnew file mode 100644 index 0000000..e6a191c --- /dev/null +++ b/chrome/app/theme/window_bottom_center.png diff --git a/chrome/app/theme/window_bottom_left_corner.png b/chrome/app/theme/window_bottom_left_corner.png Binary files differnew file mode 100644 index 0000000..db9cb72 --- /dev/null +++ b/chrome/app/theme/window_bottom_left_corner.png diff --git a/chrome/app/theme/window_bottom_right_corner.png b/chrome/app/theme/window_bottom_right_corner.png Binary files differnew file mode 100644 index 0000000..f0522a3 --- /dev/null +++ b/chrome/app/theme/window_bottom_right_corner.png diff --git a/chrome/app/theme/window_left_side.png b/chrome/app/theme/window_left_side.png Binary files differnew file mode 100644 index 0000000..d614d2c --- /dev/null +++ b/chrome/app/theme/window_left_side.png diff --git a/chrome/app/theme/window_right_side.png b/chrome/app/theme/window_right_side.png Binary files differnew file mode 100644 index 0000000..97939ef --- /dev/null +++ b/chrome/app/theme/window_right_side.png diff --git a/chrome/app/theme/window_top_center.png b/chrome/app/theme/window_top_center.png Binary files differnew file mode 100644 index 0000000..8e13cc2 --- /dev/null +++ b/chrome/app/theme/window_top_center.png diff --git a/chrome/app/theme/window_top_left_corner.png b/chrome/app/theme/window_top_left_corner.png Binary files differnew file mode 100644 index 0000000..89e5f23 --- /dev/null +++ b/chrome/app/theme/window_top_left_corner.png diff --git a/chrome/app/theme/window_top_right_corner.png b/chrome/app/theme/window_top_right_corner.png Binary files differnew file mode 100644 index 0000000..60686b3 --- /dev/null +++ b/chrome/app/theme/window_top_right_corner.png diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index dfa5a32..af54e9e 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -67,7 +67,7 @@ enum { static const int kXPFramePartIDs[] = { 0, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, IDR_CONSTRAINED_BOTTOM_CENTER, IDR_CONSTRAINED_BOTTOM_LEFT_CORNER, IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER, IDR_CONSTRAINED_LEFT_SIDE, IDR_CONSTRAINED_RIGHT_SIDE, IDR_CONSTRAINED_TOP_CENTER, @@ -75,7 +75,7 @@ static const int kXPFramePartIDs[] = { 0 }; static const int kVistaFramePartIDs[] = { 0, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, IDR_CONSTRAINED_BOTTOM_CENTER_V, IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V, IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V, IDR_CONSTRAINED_LEFT_SIDE_V, IDR_CONSTRAINED_RIGHT_SIDE_V, IDR_CONSTRAINED_TOP_CENTER_V, @@ -83,7 +83,7 @@ static const int kVistaFramePartIDs[] = { 0 }; static const int kOTRFramePartIDs[] = { 0, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR, IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR, IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR, diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index d2dda5f..23c6231 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -348,12 +348,12 @@ void EditKeywordController::UpdateImageView(ImageView* image_view, image_view->SetTooltipText(std::wstring()); image_view->SetImage( ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_INPUT_GOOD)); + IDR_VIEWS_INPUT_GOOD)); } else { image_view->SetTooltipText(l10n_util::GetString(invalid_message_id)); image_view->SetImage( ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_INPUT_ALERT)); + IDR_VIEWS_INPUT_ALERT)); } } diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 4d87db7..b3be856 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -45,9 +45,9 @@ class GlassBrowserWindowResources { if (!initialized) { static const int kFramePartBitmapIds[] = { IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER, - IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE, - IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER, - IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE, + IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE, + IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER, + IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE, }; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 957cc1d..0e20784 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -85,20 +85,20 @@ class ActiveWindowResources : public views::WindowResources { static bool initialized = false; if (!initialized) { static const int kFramePartBitmapIds[] = { - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, - IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER, - IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE, - IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER, - IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, + IDR_VIEWS_WINDOW_BOTTOM_CENTER, IDR_VIEWS_WINDOW_BOTTOM_LEFT_CORNER, + IDR_VIEWS_WINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_WINDOW_LEFT_SIDE, + IDR_VIEWS_WINDOW_RIGHT_SIDE, IDR_VIEWS_WINDOW_TOP_CENTER, + IDR_VIEWS_WINDOW_TOP_LEFT_CORNER, IDR_VIEWS_WINDOW_TOP_RIGHT_CORNER, IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER, - IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE, - IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER, - IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, + IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE, + IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER, + IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, }; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); @@ -130,20 +130,20 @@ class InactiveWindowResources : public views::WindowResources { static bool initialized = false; if (!initialized) { static const int kFramePartBitmapIds[] = { - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, - IDR_DEWINDOW_BOTTOM_CENTER, IDR_DEWINDOW_BOTTOM_LEFT_CORNER, - IDR_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_DEWINDOW_LEFT_SIDE, - IDR_DEWINDOW_RIGHT_SIDE, IDR_DEWINDOW_TOP_CENTER, - IDR_DEWINDOW_TOP_LEFT_CORNER, IDR_DEWINDOW_TOP_RIGHT_CORNER, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, + IDR_VIEWS_DEWINDOW_BOTTOM_CENTER, IDR_VIEWS_DEWINDOW_BOTTOM_LEFT_CORNER, + IDR_VIEWS_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_DEWINDOW_LEFT_SIDE, + IDR_VIEWS_DEWINDOW_RIGHT_SIDE, IDR_VIEWS_DEWINDOW_TOP_CENTER, + IDR_VIEWS_DEWINDOW_TOP_LEFT_CORNER, IDR_VIEWS_DEWINDOW_TOP_RIGHT_CORNER, IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER, - IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE, - IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER, - IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, + IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE, + IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER, + IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, }; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); @@ -175,20 +175,20 @@ class OTRActiveWindowResources : public views::WindowResources { static bool initialized = false; if (!initialized) { static const int kFramePartBitmapIds[] = { - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR, IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR, IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR, IDR_WINDOW_TOP_LEFT_CORNER_OTR, IDR_WINDOW_TOP_RIGHT_CORNER_OTR, IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER, - IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE, - IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER, - IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, + IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE, + IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER, + IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, }; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); @@ -220,21 +220,21 @@ class OTRInactiveWindowResources : public views::WindowResources { static bool initialized = false; if (!initialized) { static const int kFramePartBitmapIds[] = { - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, IDR_DEWINDOW_BOTTOM_CENTER_OTR, IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR, IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_DEWINDOW_LEFT_SIDE_OTR, IDR_DEWINDOW_RIGHT_SIDE_OTR, IDR_DEWINDOW_TOP_CENTER_OTR, IDR_DEWINDOW_TOP_LEFT_CORNER_OTR, IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR, IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER, - IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE, - IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER, - IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, + IDR_CONTENT_TOP_RIGHT_CORNER, IDR_VIEWS_CONTENT_RIGHT_SIDE, + IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, IDR_VIEWS_CONTENT_BOTTOM_CENTER, + IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, IDR_VIEWS_CONTENT_LEFT_SIDE, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, }; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 7a07810..cc11a2a 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -160,8 +160,8 @@ void FileDisplayArea::InitClass() { bool ui_is_rtl = l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT; ResourceBundle& rb = ResourceBundle::GetSharedInstance(); default_folder_icon_ = *rb.GetBitmapNamed(ui_is_rtl ? - IDR_FOLDER_CLOSED_RTL : - IDR_FOLDER_CLOSED); + IDR_VIEWS_FOLDER_CLOSED_RTL : + IDR_VIEWS_FOLDER_CLOSED); initialized = true; } } diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index cbc3b77..922ea1c 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -39,7 +39,7 @@ void TabIconView::InitializeIfNeeded() { IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16)); DestroyIcon(app_icon); - g_throbber_frames = rb.GetBitmapNamed(IDR_THROBBER); + g_throbber_frames = rb.GetBitmapNamed(IDR_VIEWS_THROBBER); g_throbber_frames_light = rb.GetBitmapNamed(IDR_THROBBER_LIGHT); g_throbber_frame_count = g_throbber_frames->width() / g_throbber_frames->height(); diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index d8d74b2..3c4a5c3 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -88,7 +88,7 @@ void InitResources() { // The loading animation image is a strip of states. Each state must be // square, so the height must divide the width evenly. - loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER); + loading_animation_frames = rb.GetBitmapNamed(IDR_VIEWS_THROBBER); DCHECK(loading_animation_frames); DCHECK(loading_animation_frames->width() % loading_animation_frames->height() == 0); diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc index bd7282b..4e0b5f7 100644 --- a/chrome/views/controls/button/text_button.cc +++ b/chrome/views/controls/button/text_button.cc @@ -41,25 +41,25 @@ static const int kHoverAnimationDurationMs = 170; TextButtonBorder::TextButtonBorder() { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - hot_set_.top_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_LEFT_H); - hot_set_.top = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_H); - hot_set_.top_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_RIGHT_H); - hot_set_.left = rb.GetBitmapNamed(IDR_TEXTBUTTON_LEFT_H); - hot_set_.center = rb.GetBitmapNamed(IDR_TEXTBUTTON_CENTER_H); - hot_set_.right = rb.GetBitmapNamed(IDR_TEXTBUTTON_RIGHT_H); - hot_set_.bottom_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_H); - hot_set_.bottom = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_H); - hot_set_.bottom_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_H); - - pushed_set_.top_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_LEFT_P); - pushed_set_.top = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_P); - pushed_set_.top_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_TOP_RIGHT_P); - pushed_set_.left = rb.GetBitmapNamed(IDR_TEXTBUTTON_LEFT_P); - pushed_set_.center = rb.GetBitmapNamed(IDR_TEXTBUTTON_CENTER_P); - pushed_set_.right = rb.GetBitmapNamed(IDR_TEXTBUTTON_RIGHT_P); - pushed_set_.bottom_left = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_LEFT_P); - pushed_set_.bottom = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_P); - pushed_set_.bottom_right = rb.GetBitmapNamed(IDR_TEXTBUTTON_BOTTOM_RIGHT_P); + hot_set_.top_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_LEFT_H); + hot_set_.top = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_H); + hot_set_.top_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_H); + hot_set_.left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_LEFT_H); + hot_set_.center = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_CENTER_H); + hot_set_.right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_RIGHT_H); + hot_set_.bottom_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_H); + hot_set_.bottom = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_H); + hot_set_.bottom_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_H); + + pushed_set_.top_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_LEFT_P); + pushed_set_.top = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_P); + pushed_set_.top_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_P); + pushed_set_.left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_LEFT_P); + pushed_set_.center = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_CENTER_P); + pushed_set_.right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_RIGHT_P); + pushed_set_.bottom_left = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_P); + pushed_set_.bottom = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_P); + pushed_set_.bottom_right = rb.GetBitmapNamed(IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_P); } TextButtonBorder::~TextButtonBorder() { diff --git a/chrome/views/controls/throbber.cc b/chrome/views/controls/throbber.cc index 58d1ac8..e8a8144 100644 --- a/chrome/views/controls/throbber.cc +++ b/chrome/views/controls/throbber.cc @@ -23,7 +23,7 @@ Throbber::Throbber(int frame_time_ms, frames_(NULL), frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) { ResourceBundle &rb = ResourceBundle::GetSharedInstance(); - frames_ = rb.GetBitmapNamed(IDR_THROBBER); + frames_ = rb.GetBitmapNamed(IDR_VIEWS_THROBBER); DCHECK(frames_->width() > 0 && frames_->height() > 0); DCHECK(frames_->width() % frames_->height() == 0); frame_count_ = frames_->width() / frames_->height(); @@ -160,7 +160,7 @@ void CheckmarkThrobber::InitClass() { static bool initialized = false; if (!initialized) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - checkmark_ = rb.GetBitmapNamed(IDR_INPUT_GOOD); + checkmark_ = rb.GetBitmapNamed(IDR_VIEWS_INPUT_GOOD); initialized = true; } } diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc index 0da388b..cb40b8f 100644 --- a/chrome/views/controls/tree/tree_view.cc +++ b/chrome/views/controls/tree/tree_view.cc @@ -620,10 +620,10 @@ HIMAGELIST TreeView::CreateImageList() { // Creates the default image list used for trees. SkBitmap* closed_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed( - (rtl ? IDR_FOLDER_CLOSED_RTL : IDR_FOLDER_CLOSED)); + (rtl ? IDR_VIEWS_FOLDER_CLOSED_RTL : IDR_VIEWS_FOLDER_CLOSED)); SkBitmap* opened_icon = ResourceBundle::GetSharedInstance().GetBitmapNamed( - (rtl ? IDR_FOLDER_OPEN_RTL : IDR_FOLDER_OPEN)); + (rtl ? IDR_VIEWS_FOLDER_OPEN_RTL : IDR_VIEWS_FOLDER_OPEN)); int width = closed_icon->width(); int height = closed_icon->height(); DCHECK(opened_icon->width() == width && opened_icon->height() == height); diff --git a/chrome/views/resources/views_resources.grd b/chrome/views/resources/views_resources.grd index 3ae884e..483d725 100644 --- a/chrome/views/resources/views_resources.grd +++ b/chrome/views/resources/views_resources.grd @@ -10,85 +10,85 @@ <release seq="1"> <includes> <!-- Window frame controls --> - <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" /> - <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_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" /> - <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" /> - <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" /> + <include name="IDR_VIEWS_CLOSE" file="close.png" type="BINDATA" /> + <include name="IDR_VIEWS_CLOSE_H" file="close_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_CLOSE_P" file="close_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_CLOSE_SA" file="close_sa.png" type="BINDATA" /> + <include name="IDR_VIEWS_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_MAXIMIZE" file="maximize.png" type="BINDATA" /> + <include name="IDR_VIEWS_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_MINIMIZE" file="minimize.png" type="BINDATA" /> + <include name="IDR_VIEWS_MINIMIZE_H" file="minimize_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_MINIMIZE_P" file="minimize_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_RESTORE" file="restore.png" type="BINDATA" /> + <include name="IDR_VIEWS_RESTORE_H" file="restore_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_RESTORE_P" file="restore_p.png" type="BINDATA" /> <!-- Active window frame parts --> - <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" /> + <include name="IDR_VIEWS_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" /> <!-- Inactive window frame parts --> - <include name="IDR_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" /> - <include name="IDR_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_BOTTOM_CENTER" file="dewindow_bottom_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_BOTTOM_LEFT_CORNER" file="dewindow_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_BOTTOM_RIGHT_CORNER" file="dewindow_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_LEFT_SIDE" file="dewindow_left_side.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_RIGHT_SIDE" file="dewindow_right_side.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_TOP_CENTER" file="dewindow_top_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_TOP_LEFT_CORNER" file="dewindow_top_left_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_DEWINDOW_TOP_RIGHT_CORNER" file="dewindow_top_right_corner.png" type="BINDATA" /> <!-- Client edge parts --> - <include name="IDR_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> - <include name="IDR_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> - <include name="IDR_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> - <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_VIEWS_APP_TOP_RIGHT" file="app_top_right.png" type="BINDATA" /> + <include name="IDR_VIEWS_APP_TOP_CENTER" file="app_top_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_APP_TOP_LEFT" file="app_top_left.png" type="BINDATA" /> + <include name="IDR_VIEWS_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" type="BINDATA" /> + <include name="IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" type="BINDATA" /> + <include name="IDR_VIEWS_CONTENT_LEFT_SIDE" file="content_left_side.png" type="BINDATA" /> + <include name="IDR_VIEWS_CONTENT_RIGHT_SIDE" file="content_right_side.png" type="BINDATA" /> <!-- Throbber --> - <include name="IDR_THROBBER" file="throbber.png" type="BINDATA" /> + <include name="IDR_VIEWS_THROBBER" file="throbber.png" type="BINDATA" /> <!-- Input types --> - <include name="IDR_INPUT_GOOD" file="input_good.png" type="BINDATA" /> - <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> - <include name="IDR_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" /> + <include name="IDR_VIEWS_INPUT_GOOD" file="input_good.png" type="BINDATA" /> + <include name="IDR_VIEWS_INPUT_ALERT" file="input_alert.png" type="BINDATA" /> + <include name="IDR_VIEWS_INPUT_UNKNOWN" file="input_unknown.png" type="BINDATA" /> <!-- Tree Folder --> - <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> - <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> - <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> - <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> + <include name="IDR_VIEWS_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> + <include name="IDR_VIEWS_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> + <include name="IDR_VIEWS_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> + <include name="IDR_VIEWS_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> <!-- Text button --> - <include name="IDR_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_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_P" file="textbutton_tr_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> - <include name="IDR_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.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_P" file="textbutton_br_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_LEFT_H" file="textbutton_tl_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_H" file="textbutton_t_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_H" file="textbutton_tr_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_LEFT_H" file="textbutton_l_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_CENTER_H" file="textbutton_c_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_RIGHT_H" file="textbutton_r_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_H" file="textbutton_bl_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_H" file="textbutton_b_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_H" file="textbutton_br_h.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_LEFT_P" file="textbutton_tl_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_P" file="textbutton_t_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_TOP_RIGHT_P" file="textbutton_tr_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_LEFT_P" file="textbutton_l_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_CENTER_P" file="textbutton_c_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_RIGHT_P" file="textbutton_r_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_LEFT_P" file="textbutton_bl_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_P" file="textbutton_b_p.png" type="BINDATA" /> + <include name="IDR_VIEWS_TEXTBUTTON_BOTTOM_RIGHT_P" file="textbutton_br_p.png" type="BINDATA" /> </includes> </release> </grit> diff --git a/chrome/views/window/custom_frame_view.cc b/chrome/views/window/custom_frame_view.cc index da15a44..47cdb76 100644 --- a/chrome/views/window/custom_frame_view.cc +++ b/chrome/views/window/custom_frame_view.cc @@ -79,19 +79,19 @@ class ActiveWindowResources : public WindowResources { if (!initialized) { static const int kFramePartBitmapIds[] = { 0, - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, - IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER, - IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE, - IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER, - IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, - IDR_CONTENT_RIGHT_SIDE, IDR_CONTENT_BOTTOM_RIGHT_CORNER, - IDR_CONTENT_BOTTOM_CENTER, IDR_CONTENT_BOTTOM_LEFT_CORNER, - IDR_CONTENT_LEFT_SIDE, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, + IDR_VIEWS_WINDOW_BOTTOM_CENTER, IDR_VIEWS_WINDOW_BOTTOM_LEFT_CORNER, + IDR_VIEWS_WINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_WINDOW_LEFT_SIDE, + IDR_VIEWS_WINDOW_RIGHT_SIDE, IDR_VIEWS_WINDOW_TOP_CENTER, + IDR_VIEWS_WINDOW_TOP_LEFT_CORNER, IDR_VIEWS_WINDOW_TOP_RIGHT_CORNER, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, + IDR_VIEWS_CONTENT_RIGHT_SIDE, IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, + IDR_VIEWS_CONTENT_BOTTOM_CENTER, IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, + IDR_VIEWS_CONTENT_LEFT_SIDE, 0 }; @@ -129,19 +129,19 @@ class InactiveWindowResources : public WindowResources { if (!initialized) { static const int kFramePartBitmapIds[] = { 0, - IDR_CLOSE, IDR_CLOSE_H, IDR_CLOSE_P, - IDR_CLOSE_SA, IDR_CLOSE_SA_H, IDR_CLOSE_SA_P, - IDR_RESTORE, IDR_RESTORE_H, IDR_RESTORE_P, - IDR_MAXIMIZE, IDR_MAXIMIZE_H, IDR_MAXIMIZE_P, - IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P, - IDR_DEWINDOW_BOTTOM_CENTER, IDR_DEWINDOW_BOTTOM_LEFT_CORNER, - IDR_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_DEWINDOW_LEFT_SIDE, - IDR_DEWINDOW_RIGHT_SIDE, IDR_DEWINDOW_TOP_CENTER, - IDR_DEWINDOW_TOP_LEFT_CORNER, IDR_DEWINDOW_TOP_RIGHT_CORNER, - IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT, - IDR_CONTENT_RIGHT_SIDE, IDR_CONTENT_BOTTOM_RIGHT_CORNER, - IDR_CONTENT_BOTTOM_CENTER, IDR_CONTENT_BOTTOM_LEFT_CORNER, - IDR_CONTENT_LEFT_SIDE, + IDR_VIEWS_CLOSE, IDR_VIEWS_CLOSE_H, IDR_VIEWS_CLOSE_P, + IDR_VIEWS_CLOSE_SA, IDR_VIEWS_CLOSE_SA_H, IDR_VIEWS_CLOSE_SA_P, + IDR_VIEWS_RESTORE, IDR_VIEWS_RESTORE_H, IDR_VIEWS_RESTORE_P, + IDR_VIEWS_MAXIMIZE, IDR_VIEWS_MAXIMIZE_H, IDR_VIEWS_MAXIMIZE_P, + IDR_VIEWS_MINIMIZE, IDR_VIEWS_MINIMIZE_H, IDR_VIEWS_MINIMIZE_P, + IDR_VIEWS_DEWINDOW_BOTTOM_CENTER, IDR_VIEWS_DEWINDOW_BOTTOM_LEFT_CORNER, + IDR_VIEWS_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_VIEWS_DEWINDOW_LEFT_SIDE, + IDR_VIEWS_DEWINDOW_RIGHT_SIDE, IDR_VIEWS_DEWINDOW_TOP_CENTER, + IDR_VIEWS_DEWINDOW_TOP_LEFT_CORNER, IDR_VIEWS_DEWINDOW_TOP_RIGHT_CORNER, + IDR_VIEWS_APP_TOP_LEFT, IDR_VIEWS_APP_TOP_CENTER, IDR_VIEWS_APP_TOP_RIGHT, + IDR_VIEWS_CONTENT_RIGHT_SIDE, IDR_VIEWS_CONTENT_BOTTOM_RIGHT_CORNER, + IDR_VIEWS_CONTENT_BOTTOM_CENTER, IDR_VIEWS_CONTENT_BOTTOM_LEFT_CORNER, + IDR_VIEWS_CONTENT_LEFT_SIDE, 0 }; |
