diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 16:11:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 16:11:39 +0000 |
| commit | 433fdc17fad8651c3dc8d3f50024e7c42dfc4154 (patch) | |
| tree | 4cd206f6ed14ae9690b9b53a14141d201d80af41 /chrome | |
| parent | 34d18e40e285579af3b5fae02ad21ce3d94745be (diff) | |
| download | chromium_src-433fdc17fad8651c3dc8d3f50024e7c42dfc4154.zip chromium_src-433fdc17fad8651c3dc8d3f50024e7c42dfc4154.tar.gz chromium_src-433fdc17fad8651c3dc8d3f50024e7c42dfc4154.tar.bz2 | |
CL to add resources needed by combined menu as well as removing tab
images from new tab animation. I'm combining this to minimize tree
bustage.
BUG=45734
TEST=none
Review URL: http://codereview.chromium.org/2854014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 15 | ||||
| -rwxr-xr-x | chrome/app/theme/fullscreen_menu_button.png | bin | 0 -> 2920 bytes | |||
| -rw-r--r-- | chrome/app/theme/tab_alpha_new_tab.png | bin | 363 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/tab_new_tab_shadow.png | bin | 474 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 4 |
5 files changed, 17 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 1bc073e..89e68b6a 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -715,6 +715,9 @@ each locale. --> <message name="IDS_NEW_INCOGNITO_WINDOW" desc="The text label of the New incognito window menu item"> New &incognito window </message> + <message name="IDS_EDIT2" desc="The text label before the cut/copy/paste buttons in the merged menu"> + Edit + </message> <message name="IDS_UNDO" desc="The text label of the Undo menu item"> &Undo </message> @@ -745,15 +748,27 @@ each locale. --> <message name="IDS_ZOOM_MENU" desc="The text label of the Zoom submenu"> &Zoom </message> + <message name="IDS_ZOOM_MENU2" desc="The text label of the Zoom menu in the merged menu"> + Zoom + </message> <message name="IDS_ZOOM_PLUS" desc="The text label of the Make Text Larger menu item"> &Larger </message> + <message name="IDS_ZOOM_PLUS2" desc="The text label of the Make Text Larger menu item in the merged menu"> + + + </message> <message name="IDS_ZOOM_NORMAL" desc="The text label of the Make Text Normal Size menu item"> &Normal </message> <message name="IDS_ZOOM_MINUS" desc="The text label of the Make Text Smaller menu item"> &Smaller </message> + <message name="IDS_ZOOM_MINUS2" desc="The text label of the Make Text Smaller menu item in the merged menu"> + - + </message> + <message name="IDS_ZOOM_PERCENT" desc="Current pages zoom factor; shown in merged menu"> + <ph name="VALUE">$1<ex>100</ex></ph>% + </message> <message name="IDS_ENCODING_MENU" desc="The text label of the Encoding submenu"> &Encoding </message> diff --git a/chrome/app/theme/fullscreen_menu_button.png b/chrome/app/theme/fullscreen_menu_button.png Binary files differnew file mode 100755 index 0000000..1098c03 --- /dev/null +++ b/chrome/app/theme/fullscreen_menu_button.png diff --git a/chrome/app/theme/tab_alpha_new_tab.png b/chrome/app/theme/tab_alpha_new_tab.png Binary files differdeleted file mode 100644 index 6d77135..0000000 --- a/chrome/app/theme/tab_alpha_new_tab.png +++ /dev/null diff --git a/chrome/app/theme/tab_new_tab_shadow.png b/chrome/app/theme/tab_new_tab_shadow.png Binary files differdeleted file mode 100644 index 989d591..0000000 --- a/chrome/app/theme/tab_new_tab_shadow.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 0dc93e1..280d417 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -274,8 +274,6 @@ <include name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" type="BINDATA" /> <include name="IDR_TAB_ALPHA_NANO_LEFT" file="tab_alpha_nano_left.png" type="BINDATA" /> <include name="IDR_TAB_ALPHA_NANO_RIGHT" file="tab_alpha_nano_right.png" type="BINDATA" /> - <include name="IDR_TAB_ALPHA_NEW_TAB" file="tab_alpha_new_tab.png" type="BINDATA" /> - <include name="IDR_TAB_NEW_TAB_SHADOW" file="tab_new_tab_shadow.png" type="BINDATA" /> <include name="IDR_DOCK_MAX" file="dock_tab_max.png" type="BINDATA" /> <include name="IDR_DOCK_HIGH" file="dock_tab_high.png" type="BINDATA" /> @@ -314,6 +312,8 @@ <include name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" type="BINDATA" /> <include name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" type="BINDATA" /> + <include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" type="BINDATA" /> + <!-- Desktop notifications --> <include name="IDR_BALLOON_BORDER" file="balloon_frame.png" type="BINDATA" /> <include name="IDR_BALLOON_SHELF" file="balloon_shelf.png" type="BINDATA" /> |
