Carnitas: move browser/shell_dialogs.{h,cc} to browser/ui

BUG=none
TEST=compile

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

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

26 files changed, 37 insertions, 41 deletions

diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index ae90d32..e690cdb 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/checkbox.h"
diff --git a/chrome/browser/dom_ui/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc
index 6fe735f..72f253c 100644
--- a/chrome/browser/dom_ui/net_internals_ui.cc
+++ b/chrome/browser/dom_ui/net_internals_ui.cc
@@ -28,9 +28,9 @@
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h
index 4d8b88d..e7f5762 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.h
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.h
@@ -11,7 +11,7 @@
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/remoting/remoting_options_handler.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 class OptionsManagedBannerHandler;
 
diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.h b/chrome/browser/dom_ui/options/certificate_manager_handler.h
index 57a1595..558109f 100644
--- a/chrome/browser/dom_ui/options/certificate_manager_handler.h
+++ b/chrome/browser/dom_ui/options/certificate_manager_handler.h
@@ -12,7 +12,7 @@
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/certificate_manager_model.h"
 #include "chrome/browser/dom_ui/options/options_ui.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "net/base/cert_database.h"
 #include "ui/gfx/native_widget_types.h"
 
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 2234841..e103a79 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -42,7 +42,7 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/download/download_status_updater_delegate.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 class DownloadFileManager;
 class DownloadHistory;
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index d6a98e9..c0752a3 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -16,8 +16,8 @@
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents_observer.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "googleurl/src/gurl.h"
 
 class SaveFileManager;
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h
index 83a1c8d..7b50b4e 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/extensions/extension_bookmarks_module.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_list.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index 9b8b722..94d8afd 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/dom_ui/web_ui.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc
index 8b7f7d5..74e74a7 100644
--- a/chrome/browser/file_select_helper.cc
+++ b/chrome/browser/file_select_helper.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/render_messages_params.h"
diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h
index 3a6fb6a..10d7260 100644
--- a/chrome/browser/file_select_helper.h
+++ b/chrome/browser/file_select_helper.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "net/base/directory_lister.h"
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 1aadf9b..5ebe132 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -23,13 +23,13 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/tabs/tab_handler.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"   // TODO(beng): remove
 #include "chrome/browser/tabs/tab_strip_model_observer.h"   // TODO(beng): remove
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
index a27bc25..93e031c 100644
--- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
+++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc
index b129ea7..5dc25a2 100644
--- a/chrome/browser/ui/gtk/certificate_dialogs.cc
+++ b/chrome/browser/ui/gtk/certificate_dialogs.cc
@@ -15,7 +15,6 @@
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/gtk/certificate_dialogs.h b/chrome/browser/ui/gtk/certificate_dialogs.h
index 656a283..a13bfca 100644
--- a/chrome/browser/ui/gtk/certificate_dialogs.h
+++ b/chrome/browser/ui/gtk/certificate_dialogs.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_GTK_CERTIFICATE_DIALOGS_H_
 #pragma once
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "net/base/x509_certificate.h"
 
 void ShowCertSelectFileDialog(SelectFileDialog* select_file_dialog,
diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc
index 8768e2d..7fe5b5cf 100644
--- a/chrome/browser/ui/gtk/dialogs_gtk.cc
+++ b/chrome/browser/ui/gtk/dialogs_gtk.cc
@@ -15,7 +15,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/shell_dialogs.cc b/chrome/browser/ui/shell_dialogs.cc
index c0f6875..01dce47 100644
--- a/chrome/browser/shell_dialogs.cc
+++ b/chrome/browser/ui/shell_dialogs.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 SelectFileDialog::FileTypeInfo::FileTypeInfo() : include_all_files(false) {}
 
diff --git a/chrome/browser/shell_dialogs.h b/chrome/browser/ui/shell_dialogs.h
index d5a5b3f..f691c34 100644
--- a/chrome/browser/shell_dialogs.h
+++ b/chrome/browser/ui/shell_dialogs.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SHELL_DIALOGS_H_
-#define CHROME_BROWSER_SHELL_DIALOGS_H_
+#ifndef CHROME_BROWSER_UI_SHELL_DIALOGS_H_
+#define CHROME_BROWSER_UI_SHELL_DIALOGS_H_
 #pragma once
 
 #include <string>
@@ -199,4 +199,4 @@ class SelectFontDialog
   virtual ~SelectFontDialog();
 };
 
-#endif  // CHROME_BROWSER_SHELL_DIALOGS_H_
+#endif  // CHROME_BROWSER_UI_SHELL_DIALOGS_H_
diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc
index e67c161..3711870 100644
--- a/chrome/browser/ui/views/options/advanced_contents_view.cc
+++ b/chrome/browser/ui/views/options/advanced_contents_view.cc
@@ -37,9 +37,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/options/show_options_url.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/clear_browsing_data.h"
 #include "chrome/browser/ui/views/list_background.h"
diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc
index 283cab2..be6b4a7 100644
--- a/chrome/browser/ui/views/options/fonts_page_view.cc
+++ b/chrome/browser/ui/views/options/fonts_page_view.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/default_encoding_combo_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/ui/views/options/fonts_page_view.h b/chrome/browser/ui/views/options/fonts_page_view.h
index 02db748..6891fda 100644
--- a/chrome/browser/ui/views/options/fonts_page_view.h
+++ b/chrome/browser/ui/views/options/fonts_page_view.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/views/options/options_page_view.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc
index c493588..f260202 100644
--- a/chrome/browser/ui/views/options/languages_page_view.cc
+++ b/chrome/browser/ui/views/options/languages_page_view.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/language_order_table_model.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc
index 7411416..ed7e77a 100644
--- a/chrome/browser/ui/views/select_file_dialog.cc
+++ b/chrome/browser/ui/views/select_file_dialog.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 #include "base/callback.h"
 #include "base/file_path.h"
@@ -16,7 +16,6 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -375,16 +374,16 @@ void SelectFileDialogImpl::FileBrowseDelegate::GetDialogSize(
 
 std::string SelectFileDialogImpl::FileBrowseDelegate::GetDialogArgs() const {
   // SelectFile inputs as json.
-  //  {
-  //    "type"            : "open",   // (or "open_multiple", "save", "folder"
-  //    "all_files"       : true,
-  //    "file_types"      : {
-  //                          "exts" : [ ["htm", "html"], ["txt"] ],
-  //                          "desc" : [ "HTML files", "Text files" ],
-  //                        },
-  //    "file_type_index" : 1,    // 1-based file type index.
-  //  }
-  //  See browser/shell_dialogs.h for more details.
+  //   {
+  //     "type"            : "open",   // (or "open_multiple", "save", "folder"
+  //     "all_files"       : true,
+  //     "file_types"      : {
+  //                           "exts" : [ ["htm", "html"], ["txt"] ],
+  //                           "desc" : [ "HTML files", "Text files" ],
+  //                         },
+  //     "file_type_index" : 1,    // 1-based file type index.
+  //   }
+  // See browser/ui/shell_dialogs.h for more details.
 
   std::string type_string;
   switch (type_) {
diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
index 9be3aac..28fd588 100644
--- a/chrome/browser/ui/views/shell_dialogs_win.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 
 #include <windows.h>
 #include <commdlg.h>
diff --git a/chrome/browser/ui/views/shell_dialogs_win_unittest.cc b/chrome/browser/ui/views/shell_dialogs_win_unittest.cc
index 0c2cad5..02fd19b2 100644
--- a/chrome/browser/ui/views/shell_dialogs_win_unittest.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ShellDialogsWin, AppendExtensionIfNeeded) {
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog.h
index 9120e49b..6c60acd 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.h
+++ b/chrome/browser/ui/views/user_data_dir_dialog.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
-#include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/ui/shell_dialogs.h"
 #include "views/window/dialog_delegate.h"
 
 class FilePath;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2adb5334..2aa6bd2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2129,8 +2129,6 @@
         'browser/sessions/session_types.h',
         'browser/sessions/tab_restore_service.cc',
         'browser/sessions/tab_restore_service.h',
-        'browser/shell_dialogs.cc',
-        'browser/shell_dialogs.h',
         'browser/shell_integration.cc',
         'browser/shell_integration.h',
         'browser/shell_integration_linux.cc',
@@ -3144,6 +3142,8 @@
         'browser/ui/options/options_window.h',
         'browser/ui/options/show_options_url.cc',
         'browser/ui/options/show_options_url.h',
+        'browser/ui/shell_dialogs.cc',
+        'browser/ui/shell_dialogs.h',
         'browser/ui/status_bubble.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',