Replace HWND with gfx::NativeWindow in RestartMessageBox so it works on Linux.

TEST=confirmed it worked on linux and didn't break the windows build by trybots
BUG=none

Review URL: http://codereview.chromium.org/1595026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44460 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 7 deletions

diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 3d4ffae..c054098 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -15,9 +15,9 @@
 // RestartMessageBox, public:
 
 // static
-void RestartMessageBox::ShowMessageBox(HWND parent_hwnd) {
+void RestartMessageBox::ShowMessageBox(gfx::NativeWindow parent_window) {
   // When the window closes, it will delete itself.
-  new RestartMessageBox(parent_hwnd);
+  new RestartMessageBox(parent_window);
 }
 
 int RestartMessageBox::GetDialogButtons() const {
@@ -49,7 +49,7 @@ views::View* RestartMessageBox::GetContentsView() {
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, private:
 
-RestartMessageBox::RestartMessageBox(HWND parent_hwnd) {
+RestartMessageBox::RestartMessageBox(gfx::NativeWindow parent_window) {
   const int kDialogWidth = 400;
   // Also deleted when the window closes.
   message_box_view_ = new MessageBoxView(
@@ -57,7 +57,7 @@ RestartMessageBox::RestartMessageBox(HWND parent_hwnd) {
       l10n_util::GetString(IDS_OPTIONS_RESTART_REQUIRED).c_str(),
       std::wstring(),
       kDialogWidth);
-  views::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(), this)->Show();
+  views::Window::CreateChromeWindow(parent_window, gfx::Rect(), this)->Show();
 }
 
 RestartMessageBox::~RestartMessageBox() {
diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h
index 5394e69..a5dcad4 100644
--- a/chrome/browser/views/restart_message_box.h
+++ b/chrome/browser/views/restart_message_box.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
 
 #include "base/basictypes.h"
+#include "gfx/native_widget_types.h"
 #include "views/window/dialog_delegate.h"
 
 class MessageBoxView;
@@ -14,8 +15,8 @@ class MessageBoxView;
 // for a change to take effect.
 class RestartMessageBox : public views::DialogDelegate {
  public:
-  // This box is modal to |parent_hwnd|.
-  static void ShowMessageBox(HWND parent_hwnd);
+  // This box is modal to |parent_window|.
+  static void ShowMessageBox(gfx::NativeWindow parent_window);
 
  protected:
   // views::DialogDelegate:
@@ -30,7 +31,7 @@ class RestartMessageBox : public views::DialogDelegate {
   virtual views::View* GetContentsView();
 
  private:
-  explicit RestartMessageBox(HWND parent_hwnd);
+  explicit RestartMessageBox(gfx::NativeWindow parent_window);
   virtual ~RestartMessageBox();
 
   MessageBoxView* message_box_view_;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ec195eb..4601b8b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2902,6 +2902,8 @@
                 #['include', '^browser/views/panels/panel_scroller_container.h'],
                 #['include', '^browser/views/panels/panel_scroller_header.cc'],
                 #['include', '^browser/views/panels/panel_scroller_header.h'],
+                ['include', '^browser/views/restart_message_box.cc'],
+                ['include', '^browser/views/restart_message_box.h'],
                 ['include', '^browser/views/sad_tab_view.cc'],
                 ['include', '^browser/views/sad_tab_view.h'],
                 ['include', '^browser/views/select_file_dialog.cc'],