diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:37:35 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 22:37:35 +0000 |
| commit | 21f9414ce35d4c1548fe6e9179a701701436c578 (patch) | |
| tree | 56bdda45cbcfd1602926daadd1dc227a0b31b652 /chrome/browser/icon_loader.cc | |
| parent | ac9deb95ac477b8827e1ec04ab6d05601891976f (diff) | |
| download | chromium_src-21f9414ce35d4c1548fe6e9179a701701436c578.zip chromium_src-21f9414ce35d4c1548fe6e9179a701701436c578.tar.gz chromium_src-21f9414ce35d4c1548fe6e9179a701701436c578.tar.bz2 | |
Move gtk_settings_get_default() call to the UI thread.
BUG=19971
Review URL: http://codereview.chromium.org/173216
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/icon_loader.cc')
| -rw-r--r-- | chrome/browser/icon_loader.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 1978ca5..a8f496c 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -5,6 +5,7 @@ #include "chrome/browser/icon_loader.h" #include "base/message_loop.h" +#include "base/mime_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -24,6 +25,11 @@ IconLoader::~IconLoader() { void IconLoader::Start() { target_message_loop_ = MessageLoop::current(); +#if defined(OS_LINUX) + // This call must happen on the UI thread before we can start loading icons. + mime_util::DetectGtkTheme(); +#endif + g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this, &IconLoader::ReadIcon)); } |