From 5007eb233a2a78a35361e27d9a9c9ae439a01ba4 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 16 May 2012 19:18:19 +0000 Subject: importer: Make use of ShowMessageBox() function in ImporterHost. This makes ImporterHost use the cross platform function instead of using the one that is Windows specific. R=pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10391097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137479 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/importer/importer_host.cc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'chrome/browser/importer') diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index 7138711..bff8dfe 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -21,6 +21,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" @@ -28,11 +29,6 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_WIN) -// TODO(port): Port this file. -#include "ui/base/win/message_box_win.h" -#endif - using content::BrowserThread; ImporterHost::ImporterHost() @@ -161,12 +157,9 @@ void ImporterHost::StartImportSettings( void ImporterHost::OnGoogleGAIACookieChecked(bool result) { #if defined(OS_WIN) if (!result) { - ui::MessageBox( - NULL, - UTF16ToWide(l10n_util::GetStringUTF16( - IDS_IMPORTER_GOOGLE_LOGIN_TEXT)).c_str(), - L"", - MB_OK | MB_TOPMOST); + browser::ShowMessageBox(NULL, + l10n_util::GetStringUTF16(IDS_IMPORTER_GOOGLE_LOGIN_TEXT), string16(), + browser::MESSAGE_BOX_TYPE_INFORMATION); GURL url("https://accounts.google.com/ServiceLogin"); DCHECK(profile_); -- cgit v1.1