diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 18:10:40 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 18:10:40 +0000 |
| commit | 6a34951a5e4790e8031788372632eabbeef9bbc2 (patch) | |
| tree | 2f3664faf6c4f11debaeaddff0bd3c2a528c7266 | |
| parent | 48fe88ff1ad52d9616b8bbb3b29a21d008731fc6 (diff) | |
| download | chromium_src-6a34951a5e4790e8031788372632eabbeef9bbc2.zip chromium_src-6a34951a5e4790e8031788372632eabbeef9bbc2.tar.gz chromium_src-6a34951a5e4790e8031788372632eabbeef9bbc2.tar.bz2 | |
Removed unnecessary ThreadRestrictions::ScopedAllowIO
The call to base::LoadNativeLibrary in ui/base/win/shell.cc was removed
in r116396, so this exception to allow IO on the UI thread is no longer needed.
BUG=61638
TEST=Running chrome on Win 7
Review URL: http://codereview.chromium.org/9178008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117919 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/browser.cc | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index f77fe04..3397461 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -539,24 +539,17 @@ void Browser::InitBrowserWindow() { fullscreen_controller_ = new FullscreenController(window_, profile_, this); #if defined(OS_WIN) && !defined(USE_AURA) - { - // TODO: This might hit the disk - // http://code.google.com/p/chromium/issues/detail?id=61638 - base::ThreadRestrictions::ScopedAllowIO allow_io; - - // Set the app user model id for this application to that of the application - // name. See http://crbug.com/7028. - ui::win::SetAppIdForWindow( - is_app() && !is_type_panel() ? - ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : - ShellIntegration::GetChromiumAppId(profile_->GetPath()), - window()->GetNativeHandle()); - - if (is_type_panel()) { - ui::win::SetAppIconForWindow( - ShellIntegration::GetChromiumIconPath(), - window()->GetNativeHandle()); - } + // Set the app user model id for this application to that of the application + // name. See http://crbug.com/7028. + ui::win::SetAppIdForWindow( + is_app() && !is_type_panel() ? + ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : + ShellIntegration::GetChromiumAppId(profile_->GetPath()), + window()->GetNativeHandle()); + + if (is_type_panel()) { + ui::win::SetAppIconForWindow(ShellIntegration::GetChromiumIconPath(), + window()->GetNativeHandle()); } #endif |