summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 04:46:44 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-29 04:46:44 +0000
commit31050e9e95d4270484885e2c76d80c7d5829c42c (patch)
tree11184c0935c73b0e1db5e60e84145c509a31c523 /chrome/app
parent99d8534c03c9cd6f64ad036a45522c9acb09ddb9 (diff)
downloadchromium_src-31050e9e95d4270484885e2c76d80c7d5829c42c.zip
chromium_src-31050e9e95d4270484885e2c76d80c7d5829c42c.tar.gz
chromium_src-31050e9e95d4270484885e2c76d80c7d5829c42c.tar.bz2
Add descriptive text for omnibox popup result items.
Fixes a couple of bugs in painting and updating: - properly size the canvas we draw the child views into so the bottom pixel doesn't bleed - properly schedule repaints when the presentation changes for the same number of results so that we repaint selection changes. Back to using system colors. Adds highlight icons. Review URL: http://codereview.chromium.org/99102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/app/theme/o2_globe_selected.pngbin0 -> 2987 bytes
-rw-r--r--chrome/app/theme/o2_history_selected.pngbin0 -> 2932 bytes
-rw-r--r--chrome/app/theme/o2_more_selected.pngbin0 -> 2927 bytes
-rw-r--r--chrome/app/theme/o2_search_selected.pngbin0 -> 2927 bytes
-rw-r--r--chrome/app/theme/o2_star_selected.pngbin0 -> 2985 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd5
7 files changed, 8 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 3930270..fe7a9ef 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -200,6 +200,9 @@ each locale. -->
<message name="IDS_AUTOCOMPLETE_NO_QUERY" desc="Dummy search term displayed when the user has no query input.">
&lt;enter query&gt;
</message>
+ <message name="IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR" desc="The separator between a result in the autocomplete popup and its description.">
+ ''' - '''
+ </message>
<message name="IDS_HISTORY_TITLE" desc="Title for the history tab.">
History
diff --git a/chrome/app/theme/o2_globe_selected.png b/chrome/app/theme/o2_globe_selected.png
new file mode 100644
index 0000000..70617cd
--- /dev/null
+++ b/chrome/app/theme/o2_globe_selected.png
Binary files differ
diff --git a/chrome/app/theme/o2_history_selected.png b/chrome/app/theme/o2_history_selected.png
new file mode 100644
index 0000000..9a2502b
--- /dev/null
+++ b/chrome/app/theme/o2_history_selected.png
Binary files differ
diff --git a/chrome/app/theme/o2_more_selected.png b/chrome/app/theme/o2_more_selected.png
new file mode 100644
index 0000000..bb9616c
--- /dev/null
+++ b/chrome/app/theme/o2_more_selected.png
Binary files differ
diff --git a/chrome/app/theme/o2_search_selected.png b/chrome/app/theme/o2_search_selected.png
new file mode 100644
index 0000000..4727ab6e
--- /dev/null
+++ b/chrome/app/theme/o2_search_selected.png
Binary files differ
diff --git a/chrome/app/theme/o2_star_selected.png b/chrome/app/theme/o2_star_selected.png
new file mode 100644
index 0000000..3e84497
--- /dev/null
+++ b/chrome/app/theme/o2_star_selected.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index deff5fc..6888bad 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -324,6 +324,11 @@
<include name="IDR_O2_MORE" file="o2_more.png" type="BINDATA" />
<include name="IDR_O2_SEARCH" file="o2_search.png" type="BINDATA" />
<include name="IDR_O2_STAR" file="o2_star.png" type="BINDATA" />
+ <include name="IDR_O2_GLOBE_SELECTED" file="o2_globe_selected.png" type="BINDATA" />
+ <include name="IDR_O2_HISTORY_SELECTED" file="o2_history_selected.png" type="BINDATA" />
+ <include name="IDR_O2_MORE_SELECTED" file="o2_more_selected.png" type="BINDATA" />
+ <include name="IDR_O2_SEARCH_SELECTED" file="o2_search_selected.png" type="BINDATA" />
+ <include name="IDR_O2_STAR_SELECTED" file="o2_star_selected.png" type="BINDATA" />
<include name="IDR_CLOSED_WINDOW" file="closed_window.png" type="BINDATA" />
<if expr="pp_ifdef('_google_chrome')">