Refactor Windows MessageBox fallback code.

chrome/browser/hang_monitor/hung_plugin_action.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 
 #include "base/metrics/histogram.h"
 #include "base/version.h"
-#include "chrome/browser/ui/views/simple_message_box_win.h"
+#include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/logging_chrome.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/webplugininfo.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/win/hwnd_util.h"
 
 namespace {
 
 const wchar_t kGTalkPluginName[] = L"Google Talk Plugin";
@@ skipping 84 matching lines @@
       // Before displaying the message box, invoke SendMessageCallback on the
       // hung window. If the callback ever hits, the window is not hung anymore
       // and we can dismiss the message box.
       SendMessageCallback(hung_window,
                           WM_NULL,
                           0,
                           0,
                           HungWindowResponseCallback,
                           reinterpret_cast<ULONG_PTR>(this));
       current_hung_plugin_window_ = hung_window;
-      // We use chrome::NativeShowMessageBox instead of chrome::ShowMessageBox
-      // because the latter depends on UI-thread classes on Win Aura. See
-      // http://crbug.com/330424.
-      if (chrome::NativeShowMessageBox(
+      if (chrome::ShowMessageBox(
               NULL, title, message, chrome::MESSAGE_BOX_TYPE_QUESTION) ==
           chrome::MESSAGE_BOX_RESULT_YES) {
         *action = HungWindowNotification::HUNG_WINDOW_TERMINATE_PROCESS;
       } else {
         // If the user choses to ignore the hung window warning, the
         // message timeout for this window should be doubled. We only
         // double the timeout property on the window if the property
         // exists. The property is deleted if the window becomes
         // responsive.
         continue_hang_detection = false;
@@ skipping 73 matching lines @@
 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window,
                                                            UINT message,
                                                            ULONG_PTR data,
                                                            LRESULT result) {
   HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data);
   DCHECK(NULL != instance);
   if (NULL != instance) {
     instance->OnWindowResponsive(target_window);
   }
 }