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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 239143007: <webview>: Move JavaScript Dialog API to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_pointer_lock_to_chrome
Patch Set: Addressed nits Created 6 years, 8 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 | « chrome/chrome_browser.gypi ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index d07848efb5e934cef4758abb96180e97262e557e..7d4e5209cbd7a42c4e6998d1fc24e719289cf68e 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -29,7 +29,6 @@
#include "content/common/edit_command.h"
#include "content/port/common/input_event_ack_state.h"
#include "content/public/browser/browser_plugin_guest_delegate.h"
-#include "content/public/browser/javascript_dialog_manager.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/browser_plugin_permission_type.h"
@@ -93,8 +92,7 @@ struct MediaStreamRequest;
// CreateNewWindow. The newly created guest will live in the same partition,
// which means it can share storage and can script this guest.
class CONTENT_EXPORT BrowserPluginGuest
- : public JavaScriptDialogManager,
- public WebContentsDelegate,
+ : public WebContentsDelegate,
public WebContentsObserver {
public:
virtual ~BrowserPluginGuest();
@@ -237,29 +235,6 @@ class CONTENT_EXPORT BrowserPluginGuest
content::WebContents* source,
const blink::WebGestureEvent& event) OVERRIDE;
- // JavaScriptDialogManager implementation.
- virtual void RunJavaScriptDialog(
- WebContents* web_contents,
- const GURL& origin_url,
- const std::string& accept_lang,
- JavaScriptMessageType javascript_message_type,
- const base::string16& message_text,
- const base::string16& default_prompt_text,
- const DialogClosedCallback& callback,
- bool* did_suppress_message) OVERRIDE;
- virtual void RunBeforeUnloadDialog(
- WebContents* web_contents,
- const base::string16& message_text,
- bool is_reload,
- const DialogClosedCallback& callback) OVERRIDE;
- virtual bool HandleJavaScriptDialog(
- WebContents* web_contents,
- bool accept,
- const base::string16* prompt_override) OVERRIDE;
- virtual void CancelActiveAndPendingDialogs(
- WebContents* web_contents) OVERRIDE;
- virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
-
// Exposes the protected web_contents() from WebContentsObserver.
WebContentsImpl* GetWebContents();
@@ -321,7 +296,6 @@ class CONTENT_EXPORT BrowserPluginGuest
friend class TestBrowserPluginGuest;
class DownloadRequest;
- class JavaScriptDialogRequest;
class NewWindowRequest;
class PermissionRequest;
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698