| Index: content/browser/renderer_host/render_view_host_impl.h
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
|
| index 21c3321a410d6de29e8bd68bc408247d4b1fbef0..6d9e5dbaf63dabfcc3c46a92fa057c93cae98153 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.h
|
| +++ b/content/browser/renderer_host/render_view_host_impl.h
|
| @@ -16,6 +16,7 @@
|
| #include "base/process_util.h"
|
| #include "content/browser/renderer_host/render_widget_host_impl.h"
|
| #include "content/browser/site_instance_impl.h"
|
| +#include "content/public/browser/javascript_message_type.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/common/window_container_type.h"
|
| @@ -23,7 +24,6 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
|
| -#include "ui/base/javascript_message_type.h"
|
| #include "webkit/glue/webaccessibility.h"
|
| #include "webkit/glue/window_open_disposition.h"
|
|
|
| @@ -501,7 +501,7 @@ class CONTENT_EXPORT RenderViewHostImpl
|
| void OnMsgRunJavaScriptMessage(const string16& message,
|
| const string16& default_prompt,
|
| const GURL& frame_url,
|
| - ui::JavascriptMessageType type,
|
| + content::JavaScriptMessageType type,
|
| IPC::Message* reply_msg);
|
| void OnMsgRunBeforeUnloadConfirm(const GURL& frame_url,
|
| const string16& message,
|
|
|