summaryrefslogtreecommitdiffstats
path: root/athena
diff options
context:
space:
mode:
Diffstat (limited to 'athena')
-rw-r--r--athena/athena.gyp2
-rw-r--r--athena/content/DEPS2
-rw-r--r--athena/content/web_activity.cc2
-rw-r--r--athena/extensions/DEPS3
-rw-r--r--athena/extensions/athena_javascript_native_dialog_factory.cc6
5 files changed, 7 insertions, 8 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;