diff options
28 files changed, 62 insertions, 64 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index b7174ce..52bfa77 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -25,8 +25,6 @@ #include "base/values.h" #include "base/waitable_event.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/app_modal_dialog.h" -#include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/automation/automation_autocomplete_edit_tracker.h" #include "chrome/browser/automation/automation_browser_tracker.h" @@ -84,6 +82,8 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index ac2622e..2c4e503 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -15,8 +15,6 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/app_modal_dialog.h" -#include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" @@ -44,7 +42,6 @@ #include "chrome/browser/history/top_sites.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/login_prompt.h" -#include "chrome/browser/native_app_modal_dialog.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/balloon_host.h" @@ -63,6 +60,9 @@ #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/translate/translate_infobar_delegate.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 64fa35ca..8e9856b 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -10,13 +10,10 @@ #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/js_modal_dialog.h" -#include "chrome/browser/native_app_modal_dialog.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -24,6 +21,9 @@ #include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_init.h" #include "chrome/browser/ui/browser_list.h" diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc index 6e23c0f..983f5ec 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher_browsertest.cc @@ -5,13 +5,13 @@ #include "chrome/browser/chromeos/tab_closeable_state_watcher.h" #include "base/file_path.h" -#include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/native_app_modal_dialog.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index 292e1bd..f32e6ee 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 4aea841..39356b9 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/file_select_helper.h" -#include "chrome/browser/message_box_handler.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" @@ -37,6 +36,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h index d4fcc89..e447376 100644 --- a/chrome/browser/extensions/extension_host.h +++ b/chrome/browser/extensions/extension_host.h @@ -12,9 +12,9 @@ #include "base/perftimer.h" #include "base/scoped_ptr.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/js_modal_dialog.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/views/extensions/extension_view.h" #elif defined(OS_MACOSX) diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 06dac0d..53184a9 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -21,7 +21,6 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_list.h" @@ -73,6 +72,7 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/gtk/js_modal_dialog_gtk.cc b/chrome/browser/gtk/js_modal_dialog_gtk.cc index b4a0953..cae6b63 100644 --- a/chrome/browser/gtk/js_modal_dialog_gtk.cc +++ b/chrome/browser/gtk/js_modal_dialog_gtk.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/js_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/js_modal_dialog_gtk.h b/chrome/browser/gtk/js_modal_dialog_gtk.h index 18d573c..47ca0ca 100644 --- a/chrome/browser/gtk/js_modal_dialog_gtk.h +++ b/chrome/browser/gtk/js_modal_dialog_gtk.h @@ -11,7 +11,7 @@ #include "app/gtk_signal.h" #include "base/logging.h" #include "base/scoped_ptr.h" -#include "chrome/browser/native_app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "gfx/native_widget_types.h" class JavaScriptAppModalDialog; diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h index 81ae92d..24dadef 100644 --- a/chrome/browser/tab_contents/background_contents.h +++ b/chrome/browser/tab_contents/background_contents.h @@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "chrome/browser/js_modal_dialog.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/view_types.h" #include "chrome/common/window_container_type.h" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 6ec6ba3..f853dc3 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -49,7 +49,6 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/hung_renderer_dialog.h" #include "chrome/browser/in_process_webkit/session_storage_namespace.h" -#include "chrome/browser/message_box_handler.h" #include "chrome/browser/load_from_memory_cache_details.h" #include "chrome/browser/load_notification_details.h" #include "chrome/browser/metrics/metric_event_duration_details.h" @@ -83,6 +82,7 @@ #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/tab_contents/web_navigation_observer.h" #include "chrome/browser/translate/page_translated_details.h" +#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 9e367a8..0c13dd3 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -21,7 +21,6 @@ #include "chrome/browser/fav_icon_helper.h" #include "chrome/browser/find_bar_controller.h" #include "chrome/browser/find_notification_details.h" -#include "chrome/browser/js_modal_dialog.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/constrained_window.h" @@ -31,6 +30,7 @@ #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/render_view_host_manager.h" #include "chrome/browser/tab_contents/tab_specific_content_settings.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/property_bag.h" #include "chrome/common/renderer_preferences.h" diff --git a/chrome/browser/app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog.cc index 506d76f..1a35cd8 100644 --- a/chrome/browser/app_modal_dialog.cc +++ b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" -#include "chrome/browser/app_modal_dialog_queue.h" -#include "chrome/browser/native_app_modal_dialog.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/app_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h index 0803972..eb64790 100644 --- a/chrome/browser/app_modal_dialog.h +++ b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog.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_APP_MODAL_DIALOG_H_ -#define CHROME_BROWSER_APP_MODAL_DIALOG_H_ +#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_ +#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_ #pragma once #include <string> @@ -79,4 +79,4 @@ class AppModalDialog { DISALLOW_COPY_AND_ASSIGN(AppModalDialog); }; -#endif // CHROME_BROWSER_APP_MODAL_DIALOG_H_ +#endif // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_ diff --git a/chrome/browser/app_modal_dialog_queue.cc b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc index d3f48d7..c29abe0 100644 --- a/chrome/browser/app_modal_dialog_queue.cc +++ b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc @@ -2,9 +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/app_modal_dialog_queue.h" - -#include "chrome/browser/browser_list.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" void AppModalDialogQueue::AddDialog(AppModalDialog* dialog) { if (!active_dialog_) { diff --git a/chrome/browser/app_modal_dialog_queue.h b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h index 90298e3..b1b221bb 100644 --- a/chrome/browser/app_modal_dialog_queue.h +++ b/chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h @@ -1,15 +1,15 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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 CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_ -#define CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_ +#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_ +#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_ #pragma once #include <queue> #include "base/singleton.h" -#include "chrome/browser/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" // Keeps a queue of AppModalDialogs, making sure only one app modal // dialog is shown at a time. @@ -82,4 +82,4 @@ class AppModalDialogQueue { DISALLOW_COPY_AND_ASSIGN(AppModalDialogQueue); }; -#endif // CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_ +#endif // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_ diff --git a/chrome/browser/js_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc index 32d35b1..a1c72f0 100644 --- a/chrome/browser/js_modal_dialog.cc +++ b/chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/js_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "base/string_util.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/native_app_modal_dialog.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "ipc/ipc_message.h" diff --git a/chrome/browser/js_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h index 440633f..5b36451 100644 --- a/chrome/browser/js_modal_dialog.h +++ b/chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_JS_MODAL_DIALOG_H_ -#define CHROME_BROWSER_JS_MODAL_DIALOG_H_ +#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JS_MODAL_DIALOG_H_ +#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JS_MODAL_DIALOG_H_ #pragma once #include <string> #include "build/build_config.h" -#include "chrome/browser/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/native_widget_types.h" @@ -114,4 +114,4 @@ class JavaScriptAppModalDialog : public AppModalDialog, DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialog); }; -#endif // CHROME_BROWSER_JS_MODAL_DIALOG_H_ +#endif // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JS_MODAL_DIALOG_H_ diff --git a/chrome/browser/message_box_handler.cc b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc index 4150945..751f85a 100644 --- a/chrome/browser/message_box_handler.cc +++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.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/message_box_handler.h" +#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" @@ -10,12 +10,12 @@ #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/js_modal_dialog.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "gfx/font.h" diff --git a/chrome/browser/message_box_handler.h b/chrome/browser/ui/app_modal_dialogs/message_box_handler.h index e6f08e5..0acfb14 100644 --- a/chrome/browser/message_box_handler.h +++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.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_MESSAGE_BOX_HANDLER_H_ -#define CHROME_BROWSER_MESSAGE_BOX_HANDLER_H_ +#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_MESSAGE_BOX_HANDLER_H_ +#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_MESSAGE_BOX_HANDLER_H_ #pragma once #include <string> @@ -38,4 +38,4 @@ void RunBeforeUnloadDialog(TabContents* tab_contents, const std::wstring& message_text, IPC::Message* reply_msg); -#endif // CHROME_BROWSER_MESSAGE_BOX_HANDLER_H_ +#endif // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_MESSAGE_BOX_HANDLER_H_ diff --git a/chrome/browser/native_app_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h index 7b4c5b2..36701fb 100644 --- a/chrome/browser/native_app_modal_dialog.h +++ b/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.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_NATIVE_APP_MODAL_DIALOG_H_ -#define CHROME_BROWSER_NATIVE_APP_MODAL_DIALOG_H_ +#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_ +#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_ #pragma once #include "gfx/native_widget_types.h" @@ -35,5 +35,5 @@ class NativeAppModalDialog { gfx::NativeWindow parent_window); }; -#endif // CHROME_BROWSER_NATIVE_APP_MODAL_DIALOG_H_ +#endif // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_ diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h index 5005358..9179b04 100644 --- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_JS_MODAL_DIALOG_COCOA_H_ #pragma once -#include "chrome/browser/native_app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "base/logging.h" #include "base/scoped_nsobject.h" diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm index f604ce3..ca10274 100644 --- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/sys_string_conversions.h" #import "chrome/browser/chrome_browser_application_mac.h" -#include "chrome/browser/js_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index a9186e8..95a8e4c 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -16,7 +16,6 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view.h" #include "chrome/browser/automation/ui_controls.h" @@ -40,6 +39,7 @@ #include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/accessible_view_helper.h" diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index c6348ea..ac20b4e 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -7,7 +7,7 @@ #include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/message_box_flags.h" -#include "chrome/browser/app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/views/window.h" #include "grit/generated_resources.h" #include "views/controls/message_box_view.h" diff --git a/chrome/browser/ui/views/js_modal_dialog_views.h b/chrome/browser/ui/views/js_modal_dialog_views.h index ce7e221..2ff27f9 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.h +++ b/chrome/browser/ui/views/js_modal_dialog_views.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_VIEWS_JS_MODAL_DIALOG_VIEWS_H_ #pragma once -#include "chrome/browser/js_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include <string> #include "app/message_box_flags.h" -#include "chrome/browser/native_app_modal_dialog.h" +#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "views/window/dialog_delegate.h" class MessageBoxView; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a815c59..c3bcf78 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -91,10 +91,6 @@ 'browser/app_icon_win.cc', 'browser/app_icon_win.h', 'browser/app_launched_animation.h', - 'browser/app_modal_dialog.cc', - 'browser/app_modal_dialog.h', - 'browser/app_modal_dialog_queue.cc', - 'browser/app_modal_dialog_queue.h', 'browser/appcache/appcache_dispatcher_host.cc', 'browser/appcache/appcache_dispatcher_host.h', 'browser/appcache/appcache_frontend_proxy.cc', @@ -1720,8 +1716,6 @@ 'browser/jankometer.h', 'browser/jumplist_win.cc', 'browser/jumplist_win.h', - 'browser/js_modal_dialog.cc', - 'browser/js_modal_dialog.h', 'browser/keychain_mac.cc', 'browser/keychain_mac.h', 'browser/language_combobox_model.cc', @@ -1751,8 +1745,6 @@ 'browser/memory_details.h', 'browser/memory_purger.cc', 'browser/memory_purger.h', - 'browser/message_box_handler.cc', - 'browser/message_box_handler.h', 'browser/metrics/histogram_synchronizer.cc', 'browser/metrics/histogram_synchronizer.h', 'browser/metrics/metric_event_duration_details.h', @@ -1774,7 +1766,6 @@ 'browser/nacl_host/nacl_broker_service_win.h', 'browser/nacl_host/nacl_process_host.cc', 'browser/nacl_host/nacl_process_host.h', - 'browser/native_app_modal_dialog.h', 'browser/net/blob_url_request_job_factory.cc', 'browser/net/blob_url_request_job_factory.h', 'browser/net/browser_url_util.cc', @@ -2554,6 +2545,15 @@ 'browser/translate/translate_manager.h', 'browser/translate/translate_prefs.cc', 'browser/translate/translate_prefs.h', + 'browser/ui/app_modal_dialogs/app_modal_dialog.cc', + 'browser/ui/app_modal_dialogs/app_modal_dialog.h', + 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc', + 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h', + 'browser/ui/app_modal_dialogs/js_modal_dialog.cc', + 'browser/ui/app_modal_dialogs/js_modal_dialog.h', + 'browser/ui/app_modal_dialogs/message_box_handler.cc', + 'browser/ui/app_modal_dialogs/message_box_handler.h', + 'browser/ui/app_modal_dialogs/native_app_modal_dialog.h', 'browser/ui/browser.cc', 'browser/ui/browser.h', 'browser/ui/browser_init.cc', |