Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 599687097cd9e5c956a3d7b98a82d78bd8ea4cd1..ecd56744388f2787013841c168df243c8444a080 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -49,8 +49,8 @@ |
#include "content/public/browser/javascript_dialogs.h" |
#include "content/public/browser/load_notification_details.h" |
#include "content/public/browser/navigation_details.h" |
-#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_details.h" |
+#include "content/public/browser/notification_service.h" |
#include "content/public/browser/resource_request_details.h" |
#include "content/public/browser/user_metrics.h" |
#include "content/public/browser/web_contents_delegate.h" |
@@ -2733,7 +2733,7 @@ void WebContentsImpl::RunJavaScriptMessage( |
const string16& message, |
const string16& default_prompt, |
const GURL& frame_url, |
- ui::JavascriptMessageType javascript_message_type, |
+ content::JavaScriptMessageType javascript_message_type, |
IPC::Message* reply_msg, |
bool* did_suppress_message) { |
// Suppress JavaScript dialogs when requested. Also suppress messages when |