| Index: chrome/browser/browser.cc
|
| diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
|
| index 955a3af0d63f891f3af9ecbacc5b2505e214d2d0..0078967bbcad629aa31e2b984a46f3c6d424cf70 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;
|
|
|
|
|