Rename app_modal_dialogs dir to app_modal

BUG=410499
TBR=benwells@chromium.org, jochen@chromium.org, agl@chromium.org

Review URL: https://codereview.chromium.org/735473002

Cr-Commit-Position: refs/heads/master@{#304697}

61 files changed, 172 insertions, 172 deletions

diff --git a/athena/athena.gyp b/athena/athena.gyp
index a0b0449..9292d25 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -133,7 +133,7 @@
       'dependencies': [
         'athena_lib',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../components/components.gyp:app_modal_dialogs',
+        '../components/components.gyp:app_modal',
         '../components/components.gyp:constrained_window',
         '../components/components.gyp:component_metrics_proto',
         '../components/components.gyp:omnibox',
diff --git a/athena/content/DEPS b/athena/content/DEPS
index 5fc372e..a8151cd 100644
--- a/athena/content/DEPS
+++ b/athena/content/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+athena/resource_manager/public",
   "+athena/strings/grit/athena_strings.h",
   "+athena/wm/public",
-  "+components/app_modal_dialogs",
+  "+components/app_modal",
   "+components/favicon_base",
   "+components/metrics/proto",
   "+components/omnibox",
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index a6bdb82..087b5d0 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -16,7 +16,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
diff --git a/athena/extensions/DEPS b/athena/extensions/DEPS
index 9de66a6..de99f8a 100644
--- a/athena/extensions/DEPS
+++ b/athena/extensions/DEPS
@@ -3,13 +3,12 @@ include_rules = [
   "+athena/activity/public",
   "+athena/home/public",
   "+athena/wm/public",
-  "+components/app_modal_dialogs",
+  "+components/app_modal",
   "+components/constrained_window",
   "+components/web_modal",
   "+content/public/browser",
   "+extensions/browser",
   "+extensions/common",
-  "+extensions/components/app_modal_dialogs",
   "+extensions/components/javascript_dialog_extensions_client",
   "+extensions/components/native_app_window",
   "+extensions/grit",
diff --git a/athena/extensions/athena_javascript_native_dialog_factory.cc b/athena/extensions/athena_javascript_native_dialog_factory.cc
index b4b9fc4..b4401a8 100644
--- a/athena/extensions/athena_javascript_native_dialog_factory.cc
+++ b/athena/extensions/athena_javascript_native_dialog_factory.cc
@@ -5,9 +5,9 @@
 #include "athena/extensions/athena_javascript_native_dialog_factory.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
-#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
+#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
+#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 class JavaScriptAppModalDialog;
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 9c14c8f..9af5855 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -200,7 +200,7 @@ static_library("browser") {
       "//cc",
       "//chrome/browser/devtools",
       "//chrome/installer/util",
-      "//components/app_modal_dialogs",
+      "//components/app_modal",
       "//components/autofill/content/browser",
       "//components/dom_distiller/content",
       "//components/keyed_service/content",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 55af4ac..7cdbf16 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -10,7 +10,7 @@ include_rules = [
   "+chrome_elf/create_file",
   "+chrome_elf/dll_hash",
   "+chromeos",
-  "+components/app_modal_dialogs",
+  "+components/app_modal",
   "+components/autofill/content/browser",
   "+components/autofill/content/common",
   "+components/autofill/core/browser",
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc
index 6de33ca..4adc125 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 61f32ff..30e35e9 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -185,7 +185,7 @@
 #endif
 
 #if !defined(OS_IOS)
-#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
+#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
 #endif
 
 #if !defined(DISABLE_NACL)
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index 8006b3e..2709134 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -26,8 +26,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 1b939fa..de34cff 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -31,8 +31,8 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc
index 2b57874..766c158 100644
--- a/chrome/browser/extensions/alert_apitest.cc
+++ b/chrome/browser/extensions/alert_apitest.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
 #include "content/public/browser/render_frame_host.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/process_manager.h"
diff --git a/chrome/browser/extensions/chrome_extension_host_delegate.cc b/chrome/browser/extensions/chrome_extension_host_delegate.cc
index e318d64..e0adf5a 100644
--- a/chrome/browser/extensions/chrome_extension_host_delegate.cc
+++ b/chrome/browser/extensions/chrome_extension_host_delegate.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 0c69af2..1353131 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index c0768e7..a81ce65 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -30,8 +30,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 31097fe..6c4ebce 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -46,7 +46,7 @@ static_library("ui") {
     "//chrome/browser/net:cert_logger_proto",
     "//chrome/common",
     "//chrome/common/net",
-    "//components/app_modal_dialogs",
+    "//components/app_modal",
     "//components/auto_login_parser",
     "//components/dom_distiller/webui",
     "//components/feedback/proto",
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
index caa23f0..ff09409 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
@@ -6,11 +6,11 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
+#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/javascript_message_type.h"
 #include "jni/JavascriptAppModalDialog_jni.h"
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
index af2ede5..bf748e4 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
@@ -8,7 +8,7 @@
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 
 class JavaScriptAppModalDialog;
 
diff --git a/chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h b/chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h
new file mode 100644
index 0000000..024aacf
--- /dev/null
+++ b/chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h
@@ -0,0 +1,11 @@
+// Copyright 2014 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_UI_APP_MODAL_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
+#define CHROME_BROWSER_UI_APP_MODAL_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
+
+void InstallChromeJavaScriptNativeDialogFactory();
+
+#endif  // CHROME_BROWSER_UI_APP_MODAL_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
+
diff --git a/chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h b/chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h
deleted file mode 100644
index 7729fa0..0000000
--- a/chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2014 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_UI_VIEWS_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
-#define CHROME_BROWSER_UI_VIEWS_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
-
-void InstallChromeJavaScriptNativeDialogFactory();
-
-#endif // CHROME_BROWSER_UI_VIEWS_CHROME_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
-
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 05b1c75..925563c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -149,7 +149,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 1fa9be5..03a0141 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -55,10 +55,10 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/sessions/base_session_service_test_helper.h"
 #include "components/translate/core/browser/language_state.h"
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
index b300180..1324def 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 
 #if __OBJC__
 @class NSAlert;
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
index 3e1f324..b0d27b4 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -11,10 +11,10 @@
 #import "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
-#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
+#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/ui_base_types.h"
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 3a6fe89..93bb88e 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -28,8 +28,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
index c1fe0c2..1f7ab42 100644
--- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
+++ b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h"
+#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
+#include "components/app_modal/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h"
 #else
-#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
+#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index affbd09..7c92fed 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -97,8 +97,8 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
+#include "components/app_modal/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/app/resources/grit/content_resources.h"
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
index 23611c3..7d1171e 100644
--- a/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
+++ b/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_X11_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
+#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
 
 class JavascriptAppModalEventBlockerX11;
 
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 2378f02..befef6d 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -18,8 +18,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 8cc1777..921221c 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -71,7 +71,7 @@
       'browser/ui/app_list/app_list_util.cc',
       'browser/ui/app_list/app_list_util.h',
       # All other browser/ui/app_list files go in chrome_browser_ui_app_list_sources.
-      'browser/ui/app_modal_dialogs/chrome_javascript_native_dialog_factory.h',
+      'browser/ui/app_modal/chrome_javascript_native_dialog_factory.h',
       'browser/ui/autofill/autofill_dialog_controller.cc',
       'browser/ui/autofill/autofill_dialog_controller.h',
       'browser/ui/autofill/autofill_dialog_models.cc',
@@ -2666,7 +2666,7 @@
             'chrome_web_ui_mojo_bindings.gyp:web_ui_mojo_bindings',
             'debugger',
             'installer_util',
-            '../components/components.gyp:app_modal_dialogs',
+            '../components/components.gyp:app_modal',
             '../components/components.gyp:autofill_content_risk_proto',
             '../components/components.gyp:translate_content_common',
             '../content/app/resources/content_resources.gyp:content_resources',
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index 762c602..10ecf4d 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -46,8 +46,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/find_in_page_observer.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
+#include "components/app_modal/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/dom_operation_notification_details.h"
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 63a9f3e..50f2c46 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -196,7 +196,7 @@ group("all_components") {
   }
 
   if (!is_ios) {
-    deps += [ "//components/app_modal_dialogs" ]
+    deps += [ "//components/app_modal" ]
   }
 
   if (toolkit_views) {
diff --git a/components/OWNERS b/components/OWNERS
index b0fe3db..6846ab2 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -3,7 +3,7 @@ caitkp@chromium.org
 erikwright@chromium.org
 jochen@chromium.org
 
-per-file app_modal_dialog*=avi@chromium.org
+per-file app_modal*=avi@chromium.org
 
 # Can not match autofill* due to crbug.com/397984
 per-file autofill.gypi=estade@chromium.org
diff --git a/components/app_modal.gypi b/components/app_modal.gypi
new file mode 100644
index 0000000..c2fe1fa
--- /dev/null
+++ b/components/app_modal.gypi
@@ -0,0 +1,48 @@
+# Copyright 2014 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.
+{
+  'targets': [
+    {
+      'target_name': 'app_modal',
+      'type': 'static_library',
+      'dependencies': [
+	'../content/content.gyp:content_browser',
+	'../content/content.gyp:content_common',
+        '../skia/skia.gyp:skia',
+        'components_strings.gyp:components_strings',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'app_modal/app_modal_dialog.cc',
+        'app_modal/app_modal_dialog.h',
+        'app_modal/app_modal_dialog_queue.cc',
+        'app_modal/app_modal_dialog_queue.h',
+        'app_modal/javascript_app_modal_dialog.cc',
+        'app_modal/javascript_app_modal_dialog.h',
+        'app_modal/javascript_dialog_extensions_client.h',
+        'app_modal/javascript_dialog_manager.cc',
+        'app_modal/javascript_dialog_manager.h',
+        'app_modal/javascript_dialog_manager_impl.cc',
+        'app_modal/javascript_dialog_manager_impl.h',
+        'app_modal/javascript_native_dialog_factory.h',
+        'app_modal/native_app_modal_dialog.h'
+      ],
+      'conditions': [
+        ['use_aura==1',{
+          'dependencies': [
+            '../ui/aura/aura.gyp:aura',
+          ],
+        }],
+        ['toolkit_views==1 and OS!="mac"', {
+          'sources': [
+            'app_modal/views/javascript_app_modal_dialog_views.h',
+            'app_modal/views/javascript_app_modal_dialog_views.cc',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/components/app_modal_dialogs/BUILD.gn b/components/app_modal/BUILD.gn
index ef2f932..26df1df 100644
--- a/components/app_modal_dialogs/BUILD.gn
+++ b/components/app_modal/BUILD.gn
@@ -4,13 +4,12 @@
 
 import("//build/config/ui.gni")
 
-static_library("app_modal_dialogs") {
+static_library("app_modal") {
   sources = [
     "app_modal_dialog.cc",
     "app_modal_dialog.h",
     "app_modal_dialog_queue.cc",
     "app_modal_dialog_queue.h",
-    "app_modal_dialog_test_util.h",
     "javascript_app_modal_dialog.cc",
     "javascript_app_modal_dialog.h",
     "javascript_dialog_extension_client.h",
diff --git a/components/app_modal_dialogs/DEPS b/components/app_modal/DEPS
index bc65d1f..bc65d1f 100644
--- a/components/app_modal_dialogs/DEPS
+++ b/components/app_modal/DEPS
diff --git a/components/app_modal_dialogs/OWNERS b/components/app_modal/OWNERS
index 704db9f..704db9f 100644
--- a/components/app_modal_dialogs/OWNERS
+++ b/components/app_modal/OWNERS
diff --git a/components/app_modal_dialogs/app_modal_dialog.cc b/components/app_modal/app_modal_dialog.cc
index 7156520..66daa5a 100644
--- a/components/app_modal_dialogs/app_modal_dialog.cc
+++ b/components/app_modal/app_modal_dialog.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 "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
 
 #include "base/logging.h"
 #include "base/run_loop.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
diff --git a/components/app_modal_dialogs/app_modal_dialog.h b/components/app_modal/app_modal_dialog.h
index 12d7f5c..7180d12 100644
--- a/components/app_modal_dialogs/app_modal_dialog.h
+++ b/components/app_modal/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 COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_
+#ifndef COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_H_
+#define COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_H_
 
 #include <string>
 
@@ -102,4 +102,4 @@ class AppModalDialogObserver {
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogObserver);
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_H_
+#endif  // COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_H_
diff --git a/components/app_modal_dialogs/app_modal_dialog_queue.cc b/components/app_modal/app_modal_dialog_queue.cc
index effacb9..b90ceb3 100644
--- a/components/app_modal_dialogs/app_modal_dialog_queue.cc
+++ b/components/app_modal/app_modal_dialog_queue.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
 
 #include "base/memory/singleton.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
 
 // static
 AppModalDialogQueue* AppModalDialogQueue::GetInstance() {
diff --git a/components/app_modal_dialogs/app_modal_dialog_queue.h b/components/app_modal/app_modal_dialog_queue.h
index aca8a23a..d1f0491 100644
--- a/components/app_modal_dialogs/app_modal_dialog_queue.h
+++ b/components/app_modal/app_modal_dialog_queue.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 COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_
+#ifndef COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_
+#define COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_
 
 #include <deque>
 
@@ -86,4 +86,4 @@ class AppModalDialogQueue {
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogQueue);
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_APP_MODAL_DIALOG_QUEUE_H_
+#endif  // COMPONENTS_APP_MODAL_APP_MODAL_DIALOG_QUEUE_H_
diff --git a/components/app_modal_dialogs/javascript_app_modal_dialog.cc b/components/app_modal/javascript_app_modal_dialog.cc
index bf7157a..8d9ccc3 100644
--- a/components/app_modal_dialogs/javascript_app_modal_dialog.cc
+++ b/components/app_modal/javascript_app_modal_dialog.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_manager_impl.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
+#include "components/app_modal/javascript_dialog_manager_impl.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/text_elider.h"
 
diff --git a/components/app_modal_dialogs/javascript_app_modal_dialog.h b/components/app_modal/javascript_app_modal_dialog.h
index 6fb0777..3ea6bca 100644
--- a/components/app_modal_dialogs/javascript_app_modal_dialog.h
+++ b/components/app_modal/javascript_app_modal_dialog.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_APP_MODAL_DIALOG_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_APP_MODAL_DIALOG_H_
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_APP_MODAL_DIALOG_H_
+#define COMPONENTS_APP_MODAL_JAVASCRIPT_APP_MODAL_DIALOG_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 
 // Extra data for JavaScript dialogs to add Chrome-only features.
@@ -98,4 +98,4 @@ class JavaScriptAppModalDialog : public AppModalDialog {
   DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialog);
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_APP_MODAL_DIALOG_H_
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_APP_MODAL_DIALOG_H_
diff --git a/components/app_modal_dialogs/javascript_dialog_extensions_client.h b/components/app_modal/javascript_dialog_extensions_client.h
index d5adb2d..466aaeb 100644
--- a/components/app_modal_dialogs/javascript_dialog_extensions_client.h
+++ b/components/app_modal/javascript_dialog_extensions_client.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 COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
+#define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@ class JavaScriptDialogExtensionsClient {
                                 std::string* name_out) = 0;
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_EXTENSIONS_CLIENT_H_
diff --git a/components/app_modal_dialogs/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc
index 99d74cd..4cb5f5f 100644
--- a/components/app_modal_dialogs/javascript_dialog_manager.cc
+++ b/components/app_modal/javascript_dialog_manager.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_extensions_client.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager_impl.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
+#include "components/app_modal/javascript_dialog_extensions_client.h"
+#include "components/app_modal/javascript_dialog_manager_impl.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
 
 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {
   return JavaScriptDialogManagerImpl::GetInstance();
diff --git a/components/app_modal_dialogs/javascript_dialog_manager.h b/components/app_modal/javascript_dialog_manager.h
index cadf945..88aa78c 100644
--- a/components/app_modal_dialogs/javascript_dialog_manager.h
+++ b/components/app_modal/javascript_dialog_manager.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 COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
+#define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include "base/memory/scoped_ptr.h"
 
@@ -30,4 +30,4 @@ void SetJavaScriptNativeDialogFactory(
 void SetJavaScriptDialogExtensionsClient(
     scoped_ptr<JavaScriptDialogExtensionsClient> client);
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/components/app_modal_dialogs/javascript_dialog_manager_impl.cc b/components/app_modal/javascript_dialog_manager_impl.cc
index ea7e95f..4203062 100644
--- a/components/app_modal_dialogs/javascript_dialog_manager_impl.cc
+++ b/components/app_modal/javascript_dialog_manager_impl.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/app_modal_dialogs/javascript_dialog_manager_impl.h"
+#include "components/app_modal/javascript_dialog_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/app_modal_dialogs/app_modal_dialog.h"
-#include "components/app_modal_dialogs/app_modal_dialog_queue.h"
-#include "components/app_modal_dialogs/javascript_dialog_extensions_client.h"
-#include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog.h"
+#include "components/app_modal/app_modal_dialog_queue.h"
+#include "components/app_modal/javascript_dialog_extensions_client.h"
+#include "components/app_modal/javascript_native_dialog_factory.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/javascript_message_type.h"
diff --git a/components/app_modal_dialogs/javascript_dialog_manager_impl.h b/components/app_modal/javascript_dialog_manager_impl.h
index 22b3dd1..4938936 100644
--- a/components/app_modal_dialogs/javascript_dialog_manager_impl.h
+++ b/components/app_modal/javascript_dialog_manager_impl.h
@@ -2,11 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_
+#define COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_
+
 #include "content/public/browser/javascript_dialog_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
 
 class JavaScriptDialogExtensionsClient;
 class JavaScriptNativeDialogFactory;
@@ -73,3 +76,4 @@ class JavaScriptDialogManagerImpl : public content::JavaScriptDialogManager {
   DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerImpl);
 };
 
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_DIALOG_MANAGER_IMPL_H_
diff --git a/components/app_modal_dialogs/javascript_native_dialog_factory.h b/components/app_modal/javascript_native_dialog_factory.h
index 513c119..155af63 100644
--- a/components/app_modal_dialogs/javascript_native_dialog_factory.h
+++ b/components/app_modal/javascript_native_dialog_factory.h
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
-
+#ifndef COMPONENTS_APP_MODAL_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
+#define COMPONENTS_APP_MODAL_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
 
 #include "ui/gfx/native_widget_types.h"
 
@@ -21,4 +20,4 @@ class JavaScriptNativeDialogFactory {
       gfx::NativeWindow parent_window) = 0;
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
+#endif  // COMPONENTS_APP_MODAL_JAVASCRIPT_NATIVE_DIALOG_FACTORY_H_
diff --git a/components/app_modal_dialogs/native_app_modal_dialog.h b/components/app_modal/native_app_modal_dialog.h
index 0d46659..192619a 100644
--- a/components/app_modal_dialogs/native_app_modal_dialog.h
+++ b/components/app_modal/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 COMPONENTS_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_
+#ifndef COMPONENTS_APP_MODAL_NATIVE_APP_MODAL_DIALOG_H_
+#define COMPONENTS_APP_MODAL_NATIVE_APP_MODAL_DIALOG_H_
 
 #include "ui/gfx/native_widget_types.h"
 
@@ -29,4 +29,4 @@ class NativeAppModalDialog {
   virtual void CancelAppModalDialog() = 0;
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_NATIVE_APP_MODAL_DIALOG_H_
+#endif  // COMPONENTS_APP_MODAL_NATIVE_APP_MODAL_DIALOG_H_
diff --git a/components/app_modal_dialogs/views/DEPS b/components/app_modal/views/DEPS
index 9783b36..9783b36 100644
--- a/components/app_modal_dialogs/views/DEPS
+++ b/components/app_modal/views/DEPS
diff --git a/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.cc b/components/app_modal/views/javascript_app_modal_dialog_views.cc
index 72e0fa2..575e66c 100644
--- a/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.cc
+++ b/components/app_modal/views/javascript_app_modal_dialog_views.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h"
+#include "components/app_modal/views/javascript_app_modal_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h b/components/app_modal/views/javascript_app_modal_dialog_views.h
index 456e55c..8165393 100644
--- a/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h
+++ b/components/app_modal/views/javascript_app_modal_dialog_views.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
-#define COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#ifndef COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#define COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/app_modal_dialogs/native_app_modal_dialog.h"
+#include "components/app_modal/native_app_modal_dialog.h"
 #include "ui/views/window/dialog_delegate.h"
 
 class JavaScriptAppModalDialog;
@@ -56,4 +56,4 @@ class JavaScriptAppModalDialogViews : public NativeAppModalDialog,
   DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews);
 };
 
-#endif  // COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#endif  // COMPONENTS_APP_MODAL_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
diff --git a/components/app_modal_dialogs.gypi b/components/app_modal_dialogs.gypi
deleted file mode 100644
index 171d502..0000000
--- a/components/app_modal_dialogs.gypi
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2014 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.
-{
-  'targets': [
-    {
-      'target_name': 'app_modal_dialogs',
-      'type': 'static_library',
-      'dependencies': [
-	'../content/content.gyp:content_browser',
-	'../content/content.gyp:content_common',
-        '../skia/skia.gyp:skia',
-        'components_strings.gyp:components_strings',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'app_modal_dialogs/app_modal_dialog.cc',
-        'app_modal_dialogs/app_modal_dialog.h',
-        'app_modal_dialogs/app_modal_dialog_queue.cc',
-        'app_modal_dialogs/app_modal_dialog_queue.h',
-        'app_modal_dialogs/app_modal_dialog_test_util.h',
-        'app_modal_dialogs/javascript_app_modal_dialog.cc',
-        'app_modal_dialogs/javascript_app_modal_dialog.h',
-        'app_modal_dialogs/javascript_dialog_extensions_client.h',
-        'app_modal_dialogs/javascript_dialog_manager.cc',
-        'app_modal_dialogs/javascript_dialog_manager.h',
-        'app_modal_dialogs/javascript_dialog_manager_impl.cc',
-        'app_modal_dialogs/javascript_dialog_manager_impl.h',
-        'app_modal_dialogs/javascript_native_dialog_factory.h',
-        'app_modal_dialogs/native_app_modal_dialog.h'
-      ],
-      'conditions': [
-        ['use_aura==1',{
-          'dependencies': [
-            '../ui/aura/aura.gyp:aura',
-          ],
-        }],
-        ['toolkit_views==1 and OS!="mac"', {
-          'sources': [
-            'app_modal_dialogs/views/javascript_app_modal_dialog_views.h',
-            'app_modal_dialogs/views/javascript_app_modal_dialog_views.cc',
-          ],
-        }],
-      ],
-    },
-  ],
-}
diff --git a/components/app_modal_dialogs_strings.grdp b/components/app_modal_strings.grdp
index f1e413c..f1e413c 100644
--- a/components/app_modal_dialogs_strings.grdp
+++ b/components/app_modal_strings.grdp
diff --git a/components/components.gyp b/components/components.gyp
index 7d7959d..87a08a75 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -66,7 +66,7 @@
   'conditions': [
     ['OS != "ios"', {
       'includes': [
-        'app_modal_dialogs.gypi',
+        'app_modal.gypi',
         'cdm.gypi',
         'copresence_sockets.gypi',
         'navigation_interception.gypi',
diff --git a/components/components_strings.grd b/components/components_strings.grd
index 7cc8583..0766ab3 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -167,7 +167,7 @@
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
-      <part file="app_modal_dialogs_strings.grdp" />
+      <part file="app_modal_strings.grdp" />
       <part file="autofill_strings.grdp" />
       <part file="bookmark_bar_strings.grdp" />
       <part file="dom_distiller_strings.grdp" />
diff --git a/extensions/components/javascript_dialog_extensions_client.gypi b/extensions/components/javascript_dialog_extensions_client.gypi
index 40d1029..611108f 100644
--- a/extensions/components/javascript_dialog_extensions_client.gypi
+++ b/extensions/components/javascript_dialog_extensions_client.gypi
@@ -7,7 +7,7 @@
       'target_name': 'javascript_dialog_extensions_client',
       'type': 'static_library',
       'dependencies': [
-        '../../components/components.gyp:app_modal_dialogs',
+        '../../components/components.gyp:app_modal',
         '../../skia/skia.gyp:skia',
         '../extensions.gyp:extensions_browser',
         '../extensions.gyp:extensions_common',
diff --git a/extensions/components/javascript_dialog_extensions_client/BUILD.gn b/extensions/components/javascript_dialog_extensions_client/BUILD.gn
index 71418e1..7e05ed7 100644
--- a/extensions/components/javascript_dialog_extensions_client/BUILD.gn
+++ b/extensions/components/javascript_dialog_extensions_client/BUILD.gn
@@ -9,7 +9,7 @@ static_library("javascript_dialog_extensions_client") {
   ]
 
   deps = [
-    "//components/app_modal_dialogs",
+    "//components/app_modal",
     "//content/public/browser",
     "//extensions/browser",
     "//extensions/common",
diff --git a/extensions/components/javascript_dialog_extensions_client/DEPS b/extensions/components/javascript_dialog_extensions_client/DEPS
index a330d83..fa862bd 100644
--- a/extensions/components/javascript_dialog_extensions_client/DEPS
+++ b/extensions/components/javascript_dialog_extensions_client/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/app_modal_dialogs",
+  "+components/app_modal",
   "+content/public/browser",
   "+extensions/browser",
   "+extensions/common",
diff --git a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
index 5522b54..ddf0272 100644
--- a/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
+++ b/extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.cc
@@ -4,8 +4,8 @@
 
 #include "extensions/components/javascript_dialog_extensions_client/javascript_dialog_extension_client_impl.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_extensions_client.h"
-#include "components/app_modal_dialogs/javascript_dialog_manager.h"
+#include "components/app_modal/javascript_dialog_extensions_client.h"
+#include "components/app_modal/javascript_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"