diff options
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 7 | ||||
| -rw-r--r-- | ui/resources/ui_resources.grd | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 00823dd..27df907 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -520,7 +520,14 @@ std::string ChromeContentBrowserClient::GetAcceptLangs(const TabContents* tab) { SkBitmap* ChromeContentBrowserClient::GetDefaultFavicon() { ResourceBundle &rb = ResourceBundle::GetSharedInstance(); +#if defined(TOUCH_UI) + // In touch builds, we want large default favicons for the tabstrip, but in + // other places (such as bookmark, manage search engines, homepage) we assume + // default favicons are 16x16. + return rb.GetBitmapNamed(IDR_DEFAULT_LARGE_FAVICON); +#else return rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); +#endif } bool ChromeContentBrowserClient::AllowAppCache( diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index b002807..fec1ec9 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -29,13 +29,8 @@ <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" /> - <if expr="not pp_ifdef('touchui')"> - <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> - <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_large_favicon.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('touchui')"> - <include name="IDR_DEFAULT_FAVICON" file="default_large_favicon.png" type="BINDATA" /> - </if> + <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" /> + <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_large_favicon.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> |