diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 23:45:25 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-11 23:45:25 +0000 |
| commit | 1bdf29eb27c00bd1be0a6f3eb65d33ecddde274f (patch) | |
| tree | 35abd9143abed93d47d2bd4bf63f922e4d5c99dc /chrome/browser/browser.cc | |
| parent | 0c557f15b825d1036a1e48a148ff10d9cd51ab0f (diff) | |
| download | chromium_src-1bdf29eb27c00bd1be0a6f3eb65d33ecddde274f.zip chromium_src-1bdf29eb27c00bd1be0a6f3eb65d33ecddde274f.tar.gz chromium_src-1bdf29eb27c00bd1be0a6f3eb65d33ecddde274f.tar.bz2 | |
Add import settings dialog on linux.
BUG=11191
TEST=Open Import Settings dialog from Chrome wrench menu on Linux and make sure it imports Firefox data as selected.
Review URL: http://codereview.chromium.org/115133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 79130d5..7de7a50 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1117,11 +1117,6 @@ void Browser::OpenClearBrowsingDataDialog() { window_->ShowClearBrowsingDataDialog(); } -void Browser::OpenImportSettingsDialog() { - UserMetrics::RecordAction(L"Import_ShowDlg", profile_); - window_->ShowImportDialog(); -} - void Browser::OpenOptionsDialog() { UserMetrics::RecordAction(L"ShowOptions", profile_); ShowOptionsWindow(OPTIONS_PAGE_DEFAULT, OPTIONS_GROUP_NONE, profile_); @@ -1137,6 +1132,13 @@ void Browser::OpenPasswordManager() { } #endif +#if defined(OS_WIN) || defined(OS_LINUX) +void Browser::OpenImportSettingsDialog() { + UserMetrics::RecordAction(L"Import_ShowDlg", profile_); + window_->ShowImportDialog(); +} +#endif + void Browser::OpenAboutChromeDialog() { UserMetrics::RecordAction(L"AboutChrome", profile_); window_->ShowAboutChromeDialog(); @@ -1349,11 +1351,13 @@ void Browser::ExecuteCommandWithDisposition( Personalization::HandleMenuItemClick(profile()); break; #endif case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; - case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; case IDC_OPTIONS: OpenOptionsDialog(); break; case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break; #endif +#if defined(OS_WIN) || defined(OS_LINUX) + case IDC_IMPORT_SETTINGS: OpenImportSettingsDialog(); break; +#endif case IDC_ABOUT: OpenAboutChromeDialog(); break; case IDC_HELP_PAGE: OpenHelpTab(); break; |