diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:36:45 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-05 23:36:45 +0000 |
| commit | ba3ea0431f89907fbfede1426a6bc944e7c91120 (patch) | |
| tree | 2a86f29a22cd30a092858e4d31172f4beb84ea85 /chrome/browser/autocomplete | |
| parent | fb5726501682d212e05ab977fa3975b976076b9a (diff) | |
| download | chromium_src-ba3ea0431f89907fbfede1426a6bc944e7c91120.zip chromium_src-ba3ea0431f89907fbfede1426a6bc944e7c91120.tar.gz chromium_src-ba3ea0431f89907fbfede1426a6bc944e7c91120.tar.bz2 | |
Replace omnibox icons with new set that are all the same size (19x19).
TBR=jnj
BUG=27570
TEST=Type "paypal.com", watch as it loads, ensure address doesn't shift sideways when the lock appears.
Review URL: http://codereview.chromium.org/1560015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete.cc | 22 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 14 |
2 files changed, 18 insertions, 18 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index db1655b..b6d7764 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -417,17 +417,17 @@ std::string AutocompleteMatch::TypeToString(Type type) { // static int AutocompleteMatch::TypeToIcon(Type type) { int icons[NUM_TYPES] = { - IDR_O2_GLOBE, - IDR_O2_GLOBE, - IDR_O2_HISTORY, - IDR_O2_HISTORY, - IDR_O2_HISTORY, - IDR_O2_GLOBE, - IDR_O2_SEARCH, - IDR_O2_SEARCH, - IDR_O2_SEARCH, - IDR_O2_SEARCH, - IDR_O2_MORE, + IDR_OMNIBOX_HTTP, + IDR_OMNIBOX_HTTP, + IDR_OMNIBOX_HISTORY, + IDR_OMNIBOX_HISTORY, + IDR_OMNIBOX_HISTORY, + IDR_OMNIBOX_HTTP, + IDR_OMNIBOX_SEARCH, + IDR_OMNIBOX_SEARCH, + IDR_OMNIBOX_SEARCH, + IDR_OMNIBOX_SEARCH, + IDR_OMNIBOX_MORE, }; DCHECK(arraysize(icons) == NUM_TYPES); return icons[type]; diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 5a51250..2f070fd 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -165,15 +165,15 @@ void SetupLayoutForMatch(PangoLayout* layout, GdkPixbuf* IconForMatch(const AutocompleteMatch& match, bool selected) { int icon = match.starred ? - IDR_O2_STAR : AutocompleteMatch::TypeToIcon(match.type); + IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type); if (selected) { switch (icon) { - case IDR_O2_GLOBE: icon = IDR_O2_GLOBE_SELECTED_DARK; break; - case IDR_O2_HISTORY: icon = IDR_O2_HISTORY_SELECTED_DARK; break; - case IDR_O2_SEARCH: icon = IDR_O2_SEARCH_SELECTED_DARK; break; - case IDR_O2_MORE: icon = IDR_O2_MORE_SELECTED_DARK; break; - case IDR_O2_STAR: icon = IDR_O2_STAR_SELECTED_DARK; break; - default: NOTREACHED(); break; + case IDR_OMNIBOX_HTTP: icon = IDR_OMNIBOX_HTTP_DARK; break; + case IDR_OMNIBOX_HISTORY: icon = IDR_OMNIBOX_HISTORY_DARK; break; + case IDR_OMNIBOX_SEARCH: icon = IDR_OMNIBOX_SEARCH_DARK; break; + case IDR_OMNIBOX_MORE: icon = IDR_OMNIBOX_MORE_DARK; break; + case IDR_OMNIBOX_STAR: icon = IDR_OMNIBOX_STAR_DARK; break; + default: NOTREACHED(); break; } } // TODO(deanm): These would be better as pixmaps someday. |