diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 22:06:07 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 22:06:07 +0000 |
| commit | 15d53df08758ee3b35a08cd058b3b57bfddba227 (patch) | |
| tree | 72c17d4153ab18c58210bab0673a92e92f152415 /chrome/browser/browser.cc | |
| parent | d7e9a8609d36bee7a8510dc95eec201ed44d37e0 (diff) | |
| download | chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.zip chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.tar.gz chromium_src-15d53df08758ee3b35a08cd058b3b57bfddba227.tar.bz2 | |
Revert 64960 - Turn on file access checks on Win.
BUG=60211
Review URL: http://codereview.chromium.org/4222005
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/4431001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 446bca6..bf4d385 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -376,19 +376,13 @@ void Browser::CreateBrowserWindow() { window_ = BrowserWindow::CreateBrowserWindow(this); #if defined(OS_WIN) - { - // 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. - win_util::SetAppIdForWindow( - type_ & TYPE_APP ? - ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : - ShellIntegration::GetChromiumAppId(profile_->GetPath()), - window()->GetNativeHandle()); - } + // Set the app user model id for this application to that of the application + // name. See http://crbug.com/7028. + win_util::SetAppIdForWindow( + type_ & TYPE_APP ? + ShellIntegration::GetAppId(UTF8ToWide(app_name_), profile_->GetPath()) : + ShellIntegration::GetChromiumAppId(profile_->GetPath()), + window()->GetNativeHandle()); #endif NotificationService::current()->Notify( |