ui/base: Move message_box_win.{h,cc} to ui/base/win.

R=sky@chromium.org
TBR=brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9669028

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

12 files changed, 24 insertions, 28 deletions

diff --git a/base/base_switches.cc b/base/base_switches.cc
index 78f55a7..7c7b061 100644
--- a/base/base_switches.cc
+++ b/base/base_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -24,10 +24,6 @@ const char kFullMemoryCrashReport[]         = "full-memory-crash-report";
 // Suppresses all error dialogs when present.
 const char kNoErrorDialogs[]                = "noerrdialogs";
 
-// Disable ui::MessageBox.  This is useful when running as part of scripts that
-// do not have a user interface.
-const char kNoMessageBox[]                  = "no-message-box";
-
 // When running certain tests that spawn child processes, this switch indicates
 // to the test framework that the current process is a child process.
 const char kTestChildProcess[]              = "test-child-process";
diff --git a/base/base_switches.h b/base/base_switches.h
index 4645a2f..288cd78 100644
--- a/base/base_switches.h
+++ b/base/base_switches.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -15,7 +15,6 @@ extern const char kDisableBreakpad[];
 extern const char kEnableDCHECK[];
 extern const char kFullMemoryCrashReport[];
 extern const char kNoErrorDialogs[];
-extern const char kNoMessageBox[];
 extern const char kTestChildProcess[];
 extern const char kV[];
 extern const char kVModule[];
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 594e64d..44dde1a 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -40,7 +40,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/message_box_win.h"
+#include "ui/base/win/message_box_win.h"
 #include "ui/gfx/platform_font_win.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/extensions/extensions_startup.cc b/chrome/browser/extensions/extensions_startup.cc
index 9d1a472..8a5a644 100644
--- a/chrome/browser/extensions/extensions_startup.cc
+++ b/chrome/browser/extensions/extensions_startup.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,7 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 
 #if defined(OS_WIN)
-#include "ui/base/message_box_win.h"
+#include "ui/base/win/message_box_win.h"
 #endif
 
 ExtensionsStartupUtil::ExtensionsStartupUtil() : pack_job_succeeded_(false) {}
diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index 5f307c8d..27c70d2 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -30,7 +30,7 @@
 
 #if defined(OS_WIN)
 // TODO(port): Port this file.
-#include "ui/base/message_box_win.h"
+#include "ui/base/win/message_box_win.h"
 #endif
 
 using content::BrowserThread;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index bfbb5f9..470e3f0 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -114,7 +114,6 @@
 #elif defined(OS_WIN)
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
-#include "ui/base/message_box_win.h"
 #include "ui/views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/views/accelerator_table.h"
diff --git a/chrome/browser/ui/views/simple_message_box_win.cc b/chrome/browser/ui/views/simple_message_box_win.cc
index 34b509a..86900d01 100644
--- a/chrome/browser/ui/views/simple_message_box_win.cc
+++ b/chrome/browser/ui/views/simple_message_box_win.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/simple_message_box.h"
 
-#include "ui/base/message_box_win.h"
+#include "ui/base/win/message_box_win.h"
 
 namespace browser {
 
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc
index 8f805fe..a521053 100644
--- a/ui/base/ui_base_switches.cc
+++ b/ui/base/ui_base_switches.cc
@@ -6,7 +6,7 @@
 
 namespace switches {
 
-// The language file that we want to try to open.  Of the form
+// The language file that we want to try to open. Of the form
 // language[-country] where language is the 2 letter code from ISO-639.
 const char kLang[]                          = "lang";
 
@@ -14,6 +14,10 @@ const char kLang[]                          = "lang";
 // path should point to a locale.pak file.
 const char kLocalePak[]                     = "locale_pak";
 
+// Disable ui::MessageBox. This is useful when running as part of scripts that
+// do not have a user interface.
+const char kNoMessageBox[]                  = "no-message-box";
+
 // Enables UI changes that make it easier to use with a touchscreen.
 const char kTouchOptimizedUI[]              = "touch-optimized-ui";
 
diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h
index 30f8a72..cf70319 100644
--- a/ui/base/ui_base_switches.h
+++ b/ui/base/ui_base_switches.h
@@ -15,6 +15,7 @@ namespace switches {
 
 UI_EXPORT extern const char kLang[];
 UI_EXPORT extern const char kLocalePak[];
+UI_EXPORT extern const char kNoMessageBox[];
 UI_EXPORT extern const char kTouchOptimizedUI[];
 
 #if defined(OS_MACOSX)
diff --git a/ui/base/message_box_win.cc b/ui/base/win/message_box_win.cc
index 622a9d8..c78e98b 100644
--- a/ui/base/message_box_win.cc
+++ b/ui/base/win/message_box_win.cc
@@ -1,15 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ui/base/message_box_win.h"
+#include "ui/base/win/message_box_win.h"
 
-#include <windows.h>
-
-#include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
-#include "base/string16.h"
+#include "ui/base/ui_base_switches.h"
 
 namespace ui {
 
diff --git a/ui/base/message_box_win.h b/ui/base/win/message_box_win.h
index ce0512f..49f15ed 100644
--- a/ui/base/message_box_win.h
+++ b/ui/base/win/message_box_win.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_BASE_MESSAGE_BOX_WIN_H_
-#define UI_BASE_MESSAGE_BOX_WIN_H_
+#ifndef UI_BASE_WIN_MESSAGE_BOX_WIN_H_
+#define UI_BASE_WIN_MESSAGE_BOX_WIN_H_
 #pragma once
 
 #include <windows.h>
@@ -24,4 +24,4 @@ UI_EXPORT int MessageBox(HWND hwnd,
 
 }  // namespace ui
 
-#endif  // UI_BASE_MESSAGE_BOX_WIN_H_
+#endif  // UI_BASE_WIN_MESSAGE_BOX_WIN_H_
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 7828b68..6d5aa33 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -169,8 +169,6 @@
         'base/l10n/l10n_util_posix.cc',
         'base/l10n/l10n_util_win.cc',
         'base/l10n/l10n_util_win.h',
-        'base/message_box_win.cc',
-        'base/message_box_win.h',
         'base/models/button_menu_item_model.cc',
         'base/models/button_menu_item_model.h',
         'base/models/combobox_model.h',
@@ -231,6 +229,8 @@
         'base/win/hwnd_util.h',
         'base/win/ime_input.cc',
         'base/win/ime_input.h',
+        'base/win/message_box_win.cc',
+        'base/win/message_box_win.h',
         'base/win/mouse_wheel_util.cc',
         'base/win/mouse_wheel_util.h',
         'base/win/shell.cc',