summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 18:59:21 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 18:59:21 +0000
commit4aee5650d2929e202dad66456b90e4ca3de7b7ae (patch)
tree6aecb1958e0733e2621e176a7ff2a1b48b8a8ef8 /chrome/chrome.gyp
parente5ed44e3fb8e120b36a666d1c65fdfa750b6c579 (diff)
downloadchromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.zip
chromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.tar.gz
chromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.tar.bz2
Implement "Import Bookmarks and Settings".
Changed to MainMenu.xib: Added a new menu item under the ^IDS_SHORT_PRODUCT_NAME menu with the name . This menu item has a tag of 40014 corredponsing to IDC_IMPORT_SETTINGS and is connected to the commandDispatch: action of the CrApplication (First Responder). Changes to Toolbar.xib: Added a new menu item with the name ^IDS_IMPORT_SETTINGS in the same manner as above. BUG=26157 TEST=Launch Chrome and inspect the current bookmarks and settings. With no browser window open and then with a browser window open choose the "Import Bookmarks and Settings..." menu option found under the "Chromium" menu. Also, with a browser window open, hoose the "Import Bookmarks and Settings..." menu option found under the page's tool menu. Select a browser from the popup, choose the items to be imported, and press OK. Then inspect the bookmarks and other settings to insure that the selected items have indeed been imported. Review URL: http://codereview.chromium.org/378036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ffdc0c1..e55cef4 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1628,6 +1628,7 @@
'app/nibs/FirstRunDialog.xib',
'app/nibs/HungRendererDialog.xib',
'app/nibs/HttpAuthLoginSheet.xib',
+ 'app/nibs/ImportSettingsDialog.xib',
'app/nibs/InfoBar.xib',
'app/nibs/InfoBarContainer.xib',
'app/nibs/ImportProgressDialog.xib',