summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 20:26:46 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 20:26:46 +0000
commit09fb50c9631f87d34196da9b3a6a18eb65bede35 (patch)
tree12d650a9c6f93ccf3d22f8dda5ef32a4a26c30fc /chrome
parente3690ed3662cf26f2231a6495cdc4f21ec3fb116 (diff)
downloadchromium_src-09fb50c9631f87d34196da9b3a6a18eb65bede35.zip
chromium_src-09fb50c9631f87d34196da9b3a6a18eb65bede35.tar.gz
chromium_src-09fb50c9631f87d34196da9b3a6a18eb65bede35.tar.bz2
Increasing toolbar for touch case, assets are not final
BUG=none TEST=none Review URL: http://codereview.chromium.org/6730039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/large_back.pngbin0 -> 53766 bytes
-rw-r--r--chrome/app/theme/large_back_d.pngbin0 -> 52053 bytes
-rw-r--r--chrome/app/theme/large_back_h.pngbin0 -> 59139 bytes
-rw-r--r--chrome/app/theme/large_back_p.pngbin0 -> 62459 bytes
-rw-r--r--chrome/app/theme/large_content_top_center.pngbin0 -> 48123 bytes
-rw-r--r--chrome/app/theme/large_content_top_left_corner.pngbin0 -> 49532 bytes
-rw-r--r--chrome/app/theme/large_content_top_left_corner_mask.pngbin0 -> 49626 bytes
-rw-r--r--chrome/app/theme/large_content_top_right_corner.pngbin0 -> 50906 bytes
-rw-r--r--chrome/app/theme/large_content_top_right_corner_mask.pngbin0 -> 48129 bytes
-rw-r--r--chrome/app/theme/large_feedback.pngbin0 -> 58575 bytes
-rw-r--r--chrome/app/theme/large_feedback_h.pngbin0 -> 60915 bytes
-rw-r--r--chrome/app/theme/large_feedback_p.pngbin0 -> 65508 bytes
-rw-r--r--chrome/app/theme/large_forward.pngbin0 -> 54861 bytes
-rw-r--r--chrome/app/theme/large_forward_d.pngbin0 -> 53585 bytes
-rw-r--r--chrome/app/theme/large_forward_h.pngbin0 -> 60043 bytes
-rw-r--r--chrome/app/theme/large_forward_p.pngbin0 -> 61338 bytes
-rw-r--r--chrome/app/theme/large_home.pngbin0 -> 56074 bytes
-rw-r--r--chrome/app/theme/large_home_h.pngbin0 -> 59087 bytes
-rw-r--r--chrome/app/theme/large_home_p.pngbin0 -> 63685 bytes
-rw-r--r--chrome/app/theme/large_reload.pngbin0 -> 57517 bytes
-rw-r--r--chrome/app/theme/large_reload_h.pngbin0 -> 60757 bytes
-rw-r--r--chrome/app/theme/large_reload_p.pngbin0 -> 64431 bytes
-rw-r--r--chrome/app/theme/large_star.pngbin0 -> 56403 bytes
-rw-r--r--chrome/app/theme/large_star_lit.pngbin0 -> 57632 bytes
-rw-r--r--chrome/app/theme/large_stop.pngbin0 -> 53202 bytes
-rw-r--r--chrome/app/theme/large_stop_d.pngbin0 -> 52613 bytes
-rw-r--r--chrome/app/theme/large_stop_h.pngbin0 -> 58739 bytes
-rw-r--r--chrome/app/theme/large_stop_p.pngbin0 -> 61343 bytes
-rw-r--r--chrome/app/theme/large_tools.pngbin0 -> 56869 bytes
-rw-r--r--chrome/app/theme/large_tools_h.pngbin0 -> 60227 bytes
-rw-r--r--chrome/app/theme/large_tools_p.pngbin0 -> 62194 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd129
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_views.cc6
33 files changed, 104 insertions, 31 deletions
diff --git a/chrome/app/theme/large_back.png b/chrome/app/theme/large_back.png
new file mode 100644
index 0000000..8388f7b
--- /dev/null
+++ b/chrome/app/theme/large_back.png
Binary files differ
diff --git a/chrome/app/theme/large_back_d.png b/chrome/app/theme/large_back_d.png
new file mode 100644
index 0000000..acc85ba
--- /dev/null
+++ b/chrome/app/theme/large_back_d.png
Binary files differ
diff --git a/chrome/app/theme/large_back_h.png b/chrome/app/theme/large_back_h.png
new file mode 100644
index 0000000..fa1b7e0
--- /dev/null
+++ b/chrome/app/theme/large_back_h.png
Binary files differ
diff --git a/chrome/app/theme/large_back_p.png b/chrome/app/theme/large_back_p.png
new file mode 100644
index 0000000..3fdedd0
--- /dev/null
+++ b/chrome/app/theme/large_back_p.png
Binary files differ
diff --git a/chrome/app/theme/large_content_top_center.png b/chrome/app/theme/large_content_top_center.png
new file mode 100644
index 0000000..3c52c1a
--- /dev/null
+++ b/chrome/app/theme/large_content_top_center.png
Binary files differ
diff --git a/chrome/app/theme/large_content_top_left_corner.png b/chrome/app/theme/large_content_top_left_corner.png
new file mode 100644
index 0000000..065a8c9
--- /dev/null
+++ b/chrome/app/theme/large_content_top_left_corner.png
Binary files differ
diff --git a/chrome/app/theme/large_content_top_left_corner_mask.png b/chrome/app/theme/large_content_top_left_corner_mask.png
new file mode 100644
index 0000000..ee4adb6
--- /dev/null
+++ b/chrome/app/theme/large_content_top_left_corner_mask.png
Binary files differ
diff --git a/chrome/app/theme/large_content_top_right_corner.png b/chrome/app/theme/large_content_top_right_corner.png
new file mode 100644
index 0000000..05ec53b
--- /dev/null
+++ b/chrome/app/theme/large_content_top_right_corner.png
Binary files differ
diff --git a/chrome/app/theme/large_content_top_right_corner_mask.png b/chrome/app/theme/large_content_top_right_corner_mask.png
new file mode 100644
index 0000000..f7b5fe7
--- /dev/null
+++ b/chrome/app/theme/large_content_top_right_corner_mask.png
Binary files differ
diff --git a/chrome/app/theme/large_feedback.png b/chrome/app/theme/large_feedback.png
new file mode 100644
index 0000000..8146bc5
--- /dev/null
+++ b/chrome/app/theme/large_feedback.png
Binary files differ
diff --git a/chrome/app/theme/large_feedback_h.png b/chrome/app/theme/large_feedback_h.png
new file mode 100644
index 0000000..66747fd
--- /dev/null
+++ b/chrome/app/theme/large_feedback_h.png
Binary files differ
diff --git a/chrome/app/theme/large_feedback_p.png b/chrome/app/theme/large_feedback_p.png
new file mode 100644
index 0000000..852ac0f
--- /dev/null
+++ b/chrome/app/theme/large_feedback_p.png
Binary files differ
diff --git a/chrome/app/theme/large_forward.png b/chrome/app/theme/large_forward.png
new file mode 100644
index 0000000..c0f55d3
--- /dev/null
+++ b/chrome/app/theme/large_forward.png
Binary files differ
diff --git a/chrome/app/theme/large_forward_d.png b/chrome/app/theme/large_forward_d.png
new file mode 100644
index 0000000..70e92db
--- /dev/null
+++ b/chrome/app/theme/large_forward_d.png
Binary files differ
diff --git a/chrome/app/theme/large_forward_h.png b/chrome/app/theme/large_forward_h.png
new file mode 100644
index 0000000..6faecc6
--- /dev/null
+++ b/chrome/app/theme/large_forward_h.png
Binary files differ
diff --git a/chrome/app/theme/large_forward_p.png b/chrome/app/theme/large_forward_p.png
new file mode 100644
index 0000000..5edaec9
--- /dev/null
+++ b/chrome/app/theme/large_forward_p.png
Binary files differ
diff --git a/chrome/app/theme/large_home.png b/chrome/app/theme/large_home.png
new file mode 100644
index 0000000..4981bbc
--- /dev/null
+++ b/chrome/app/theme/large_home.png
Binary files differ
diff --git a/chrome/app/theme/large_home_h.png b/chrome/app/theme/large_home_h.png
new file mode 100644
index 0000000..e2bab16
--- /dev/null
+++ b/chrome/app/theme/large_home_h.png
Binary files differ
diff --git a/chrome/app/theme/large_home_p.png b/chrome/app/theme/large_home_p.png
new file mode 100644
index 0000000..d77f088
--- /dev/null
+++ b/chrome/app/theme/large_home_p.png
Binary files differ
diff --git a/chrome/app/theme/large_reload.png b/chrome/app/theme/large_reload.png
new file mode 100644
index 0000000..044ff8f
--- /dev/null
+++ b/chrome/app/theme/large_reload.png
Binary files differ
diff --git a/chrome/app/theme/large_reload_h.png b/chrome/app/theme/large_reload_h.png
new file mode 100644
index 0000000..48cd795
--- /dev/null
+++ b/chrome/app/theme/large_reload_h.png
Binary files differ
diff --git a/chrome/app/theme/large_reload_p.png b/chrome/app/theme/large_reload_p.png
new file mode 100644
index 0000000..0c37ed4
--- /dev/null
+++ b/chrome/app/theme/large_reload_p.png
Binary files differ
diff --git a/chrome/app/theme/large_star.png b/chrome/app/theme/large_star.png
new file mode 100644
index 0000000..be30522
--- /dev/null
+++ b/chrome/app/theme/large_star.png
Binary files differ
diff --git a/chrome/app/theme/large_star_lit.png b/chrome/app/theme/large_star_lit.png
new file mode 100644
index 0000000..e86ba2c
--- /dev/null
+++ b/chrome/app/theme/large_star_lit.png
Binary files differ
diff --git a/chrome/app/theme/large_stop.png b/chrome/app/theme/large_stop.png
new file mode 100644
index 0000000..364152a
--- /dev/null
+++ b/chrome/app/theme/large_stop.png
Binary files differ
diff --git a/chrome/app/theme/large_stop_d.png b/chrome/app/theme/large_stop_d.png
new file mode 100644
index 0000000..2b824af
--- /dev/null
+++ b/chrome/app/theme/large_stop_d.png
Binary files differ
diff --git a/chrome/app/theme/large_stop_h.png b/chrome/app/theme/large_stop_h.png
new file mode 100644
index 0000000..fa432a1
--- /dev/null
+++ b/chrome/app/theme/large_stop_h.png
Binary files differ
diff --git a/chrome/app/theme/large_stop_p.png b/chrome/app/theme/large_stop_p.png
new file mode 100644
index 0000000..e249bd2
--- /dev/null
+++ b/chrome/app/theme/large_stop_p.png
Binary files differ
diff --git a/chrome/app/theme/large_tools.png b/chrome/app/theme/large_tools.png
new file mode 100644
index 0000000..f94ef38
--- /dev/null
+++ b/chrome/app/theme/large_tools.png
Binary files differ
diff --git a/chrome/app/theme/large_tools_h.png b/chrome/app/theme/large_tools_h.png
new file mode 100644
index 0000000..a0b6a74
--- /dev/null
+++ b/chrome/app/theme/large_tools_h.png
Binary files differ
diff --git a/chrome/app/theme/large_tools_p.png b/chrome/app/theme/large_tools_p.png
new file mode 100644
index 0000000..2bfc75f
--- /dev/null
+++ b/chrome/app/theme/large_tools_p.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 30ab0f3..728fd8c 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -27,10 +27,18 @@
<include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BINDATA" />
<include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BINDATA" />
<include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
- <include name="IDR_BACK" file="back.png" type="BINDATA" />
- <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
- <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
- <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_BACK" file="back.png" type="BINDATA" />
+ <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
+ <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
+ <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_BACK" file="large_back.png" type="BINDATA" />
+ <include name="IDR_BACK_D" file="large_back_d.png" type="BINDATA" />
+ <include name="IDR_BACK_H" file="large_back_h.png" type="BINDATA" />
+ <include name="IDR_BACK_P" file="large_back_p.png" type="BINDATA" />
+ </if>
<include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
<include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" />
<include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BINDATA" />
@@ -92,11 +100,20 @@
<include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_v.png" type="BINDATA" />
<include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_left_corner_v.png" type="BINDATA" />
<include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_right_corner_v.png" type="BINDATA" />
- <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
- <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" type="BINDATA" />
- <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" type="BINDATA" />
- <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" />
- <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_CONTENT_TOP_CENTER" file="large_content_top_center.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_LEFT_CORNER" file="large_content_top_left_corner.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="large_content_top_left_corner_mask.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_RIGHT_CORNER" file="large_content_top_right_corner.png" type="BINDATA" />
+ <include name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="large_content_top_right_corner_mask.png" type="BINDATA" />
+ </if>
<include name="IDR_COOKIE_ICON" file="cookie.png" type="BINDATA" />
<include name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" type="BINDATA" />
<if expr="pp_ifdef('_google_chrome')">
@@ -156,9 +173,16 @@
<include name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" type="BINDATA" />
<include name="IDR_EXTENSION_DEFAULT_ICON" file="extension_default_icon.png" type="BINDATA" />
<include name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" type="BINDATA" />
- <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
- <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
- <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
+ <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
+ <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_FEEDBACK" file="large_feedback.png" type="BINDATA" />
+ <include name="IDR_FEEDBACK_H" file="large_feedback_h.png" type="BINDATA" />
+ <include name="IDR_FEEDBACK_P" file="large_feedback_p.png" type="BINDATA" />
+ </if>
<include name="IDR_FINDINPAGE_NEXT" file="find_next.png" type="BINDATA" />
<include name="IDR_FINDINPAGE_NEXT_H" file="find_next_h.png" type="BINDATA" />
<include name="IDR_FINDINPAGE_NEXT_P" file="find_next_d.png" type="BINDATA" />
@@ -174,19 +198,34 @@
<include name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="find_dlg_middle_bg.png" type="BINDATA" />
<include name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="find_dlg_right_bg.png" type="BINDATA" />
<include name="IDR_FLAGS" file="flags.png" type="BINDATA" />
- <include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
- <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
- <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
- <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_FORWARD" file="forward.png" type="BINDATA" />
+ <include name="IDR_FORWARD_D" file="forward_d.png" type="BINDATA" />
+ <include name="IDR_FORWARD_H" file="forward_h.png" type="BINDATA" />
+ <include name="IDR_FORWARD_P" file="forward_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_FORWARD" file="large_forward.png" type="BINDATA" />
+ <include name="IDR_FORWARD_D" file="large_forward_d.png" type="BINDATA" />
+ <include name="IDR_FORWARD_H" file="large_forward_h.png" type="BINDATA" />
+ <include name="IDR_FORWARD_P" file="large_forward_p.png" type="BINDATA" />
+ </if>
<include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" />
<include name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" type="BINDATA" />
<include name="IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON" file="geolocation_allowed_locationbar_icon.png" type="BINDATA" />
<include name="IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON" file="geolocation_denied_locationbar_icon.png" type="BINDATA" />
<include name="IDR_GEOLOCATION_INFOBAR_ICON" file="geolocation_infobar_icon.png" type="BINDATA" />
<include name="IDR_HISTORY_FAVICON" file="history_favicon.png" type="BINDATA" />
- <include name="IDR_HOME" file="home.png" type="BINDATA" />
- <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
- <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_HOME" file="home.png" type="BINDATA" />
+ <include name="IDR_HOME_H" file="home_h.png" type="BINDATA" />
+ <include name="IDR_HOME_P" file="home_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_HOME" file="large_home.png" type="BINDATA" />
+ <include name="IDR_HOME_H" file="large_home_h.png" type="BINDATA" />
+ <include name="IDR_HOME_P" file="large_home_p.png" type="BINDATA" />
+ </if>
<if expr="os.find('win') != -1">
<include name="IDR_INCOMPATIBILITY_DOT_ACTIVE" file="incompatibility_dot_active.png" type="BINDATA" />
<include name="IDR_INCOMPATIBILITY_DOT_INACTIVE" file="incompatibility_dot_inactive.png" type="BINDATA" />
@@ -293,9 +332,16 @@
<include name="IDR_PROFILE_TAG_INACTIVE_CENTER" file="profile_tag_inactive_center.png" type="BINDATA" />
<include name="IDR_PROFILE_TAG_INACTIVE_LEFT" file="profile_tag_inactive_left.png" type="BINDATA" />
<include name="IDR_PROFILE_TAG_INACTIVE_RIGHT" file="profile_tag_inactive_right.png" type="BINDATA" />
- <include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
- <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
- <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
+ <include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
+ <include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_RELOAD" file="large_reload.png" type="BINDATA" />
+ <include name="IDR_RELOAD_H" file="large_reload_h.png" type="BINDATA" />
+ <include name="IDR_RELOAD_P" file="large_reload_p.png" type="BINDATA" />
+ </if>
<include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" type="BINDATA" />
<include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
<include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
@@ -377,8 +423,14 @@
<include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" />
<include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" />
<include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" type="BINDATA" />
- <include name="IDR_STAR" file="star.png" type="BINDATA" />
- <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_STAR" file="star.png" type="BINDATA" />
+ <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_STAR" file="large_star.png" type="BINDATA" />
+ <include name="IDR_STAR_LIT" file="large_star_lit.png" type="BINDATA" />
+ </if>
<if expr="pp_ifdef('_google_chrome') and (os == 'darwin')">
<include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22_mono.png" type="BINDATA" />
<include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product_logo_22_mono_invert.png" type="BINDATA" />
@@ -395,10 +447,18 @@
<include name="IDR_STATUS_TRAY_ICON" file="chromium/product_logo_22.png" type="BINDATA" />
<include name="IDR_STATUS_TRAY_ICON_PRESSED" file="chromium/product_logo_22.png" type="BINDATA" />
</if>
- <include name="IDR_STOP" file="stop.png" type="BINDATA" />
- <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
- <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
- <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_STOP" file="stop.png" type="BINDATA" />
+ <include name="IDR_STOP_D" file="stop_d.png" type="BINDATA" />
+ <include name="IDR_STOP_H" file="stop_h.png" type="BINDATA" />
+ <include name="IDR_STOP_P" file="stop_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_STOP" file="large_stop.png" type="BINDATA" />
+ <include name="IDR_STOP_D" file="large_stop_d.png" type="BINDATA" />
+ <include name="IDR_STOP_H" file="large_stop_h.png" type="BINDATA" />
+ <include name="IDR_STOP_P" file="large_stop_p.png" type="BINDATA" />
+ </if>
<if expr="os == 'darwin'">
<include name="IDR_TABPOSE_CLOSE" file="tabpose_close.png" type="BINDATA" />
</if>
@@ -456,9 +516,16 @@
<include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" type="BINDATA" />
</if>
<include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" />
- <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
- <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
- <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
+ <if expr="not pp_ifdef('touchui')">
+ <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
+ <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
+ <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
+ </if>
+ <if expr="pp_ifdef('touchui')">
+ <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />
+ <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />
+ <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />
+ </if>
<include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
<include name="IDR_UPDATE_BADGE" file="update_badge.png" type="BINDATA" />
<include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
index 76a22d4..5f9178b 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
@@ -23,6 +23,7 @@
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/font.h"
#include "views/border.h"
#include "views/controls/textfield/textfield.h"
@@ -148,6 +149,11 @@ void AutocompleteEditViewViews::Init() {
textfield_ = new AutocompleteTextfield(this);
textfield_->SetController(this);
+#if defined(TOUCH_UI)
+ textfield_->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+ ResourceBundle::LargeFont));
+#endif
+
if (popup_window_mode_)
textfield_->SetReadOnly(true);