diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 22:25:14 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-26 22:25:14 +0000 |
| commit | 81fcf950c92dc813a46de3e2854fdfa8957cde3c (patch) | |
| tree | 75f9998bdb81f45cc8a1de3b32dca438a3a3dda3 /chrome/browser/shell_integration_win.cc | |
| parent | 237f399fb735afc0ec4f11ed63f06d92daeb6214 (diff) | |
| download | chromium_src-81fcf950c92dc813a46de3e2854fdfa8957cde3c.zip chromium_src-81fcf950c92dc813a46de3e2854fdfa8957cde3c.tar.gz chromium_src-81fcf950c92dc813a46de3e2854fdfa8957cde3c.tar.bz2 | |
Delay MigrateChromiumShortcuts() task at startup.
BUG=160499
Review URL: https://chromiumcodereview.appspot.com/11299138
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index aa45a1c..2dc1c13 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -443,9 +443,14 @@ void ShellIntegration::MigrateChromiumShortcuts() { if (base::win::GetVersion() < base::win::VERSION_WIN7) return; - BrowserThread::PostTask( + // This needs to happen eventually (e.g. so that the appid is fixed and the + // run-time Chrome icon is merged with the taskbar shortcut), but this is not + // urgent and shouldn't delay Chrome startup. + static const int64 kMigrateChromiumShortcutsDelaySeconds = 15; + BrowserThread::PostDelayedTask( BrowserThread::FILE, FROM_HERE, - base::Bind(&MigrateChromiumShortcutsCallback)); + base::Bind(&MigrateChromiumShortcutsCallback), + base::TimeDelta::FromSeconds(kMigrateChromiumShortcutsDelaySeconds)); } FilePath ShellIntegration::GetStartMenuShortcut(const FilePath& chrome_exe) { |