diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 21:30:30 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 21:30:30 +0000 |
| commit | 0f13d43543d0ede90ffeb264b2d3427837154807 (patch) | |
| tree | 6fffe589b16e32c28c3f3f519e872b8fa90a245d /chrome/browser/browser_main.cc | |
| parent | d8f5ac2b04a8f895ae1a11eb6cdf618e6d16f467 (diff) | |
| download | chromium_src-0f13d43543d0ede90ffeb264b2d3427837154807.zip chromium_src-0f13d43543d0ede90ffeb264b2d3427837154807.tar.gz chromium_src-0f13d43543d0ede90ffeb264b2d3427837154807.tar.bz2 | |
Disble loading window icons for chromeos.
BUG=chromium-os:4996
TEST=manual: run debug build on the device. it should start without DCHECK error described in the bug above.
Review URL: http://codereview.chromium.org/2824068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 2e39277..7d645fe 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -825,7 +825,10 @@ int BrowserMain(const MainFunctionParams& parameters) { #endif // !defined(OS_MACOSX) } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) + // gdk_pixbuf_loader_write always fails on chromeos device. + // Disabling for chromeos as well because chromeos is not using them. + // http://crosbug.com/4996 . gtk_util::SetDefaultWindowIcon(); #endif |