Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2082)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/content/web_activity.cc

Issue 692563002: JS dialogs for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/content/DEPS ('k') | athena/extensions/DEPS » ('j') | athena/extensions/athena_constrained_window_views_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/web_activity.cc
diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
index b29deef77d7a6eedf6b8e491aa0f7fad374013ad..6d570b8796eb90a7600b5ceffa3f622059922c09 100644
--- a/athena/content/web_activity.cc
+++ b/athena/content/web_activity.cc
@@ -15,6 +15,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/favicon_base/select_favicon_frames.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/navigation_controller.h"
@@ -364,8 +365,7 @@ class AthenaWebView : public views::WebView {
}
content::JavaScriptDialogManager* GetJavaScriptDialogManager() override {
- NOTIMPLEMENTED();
- return nullptr;
+ return GetJavaScriptDialogManagerInstance();
}
content::ColorChooser* OpenColorChooser(
« no previous file with comments | « athena/content/DEPS ('k') | athena/extensions/DEPS » ('j') | athena/extensions/athena_constrained_window_views_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698