diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 00:11:09 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 00:11:09 +0000 |
| commit | 84b3b581783280f253d01afd38d5a0a84fc0b3e3 (patch) | |
| tree | ef46e41400cf68f4507aa20434023b135447cb71 /chrome/chrome.gyp | |
| parent | db7312247e90aea03c1dc41f88f9d7b2b35d0c24 (diff) | |
| download | chromium_src-84b3b581783280f253d01afd38d5a0a84fc0b3e3.zip chromium_src-84b3b581783280f253d01afd38d5a0a84fc0b3e3.tar.gz chromium_src-84b3b581783280f253d01afd38d5a0a84fc0b3e3.tar.bz2 | |
Add dialog to tell user to close Firefox during import, if it's open and blocking. OS-Mac only.
BUG= http://crbug.com/20899
TEST= Open Firefox; start up Chrome and try to import settings from Firefox. Dialog box warns you to close Firefox.
Review URL: http://codereview.chromium.org/283023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ce254bd..f597f05 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1124,6 +1124,8 @@ 'browser/cocoa/hung_renderer_controller.mm', 'browser/cocoa/import_progress_dialog.h', 'browser/cocoa/import_progress_dialog.mm', + 'browser/cocoa/importer_lock_dialog.h', + 'browser/cocoa/importer_lock_dialog.mm', 'browser/cocoa/infobar.h', 'browser/cocoa/infobar_container_controller.h', 'browser/cocoa/infobar_container_controller.mm', |