| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 119ddad2db0cf4ecbcc83440948b92f2b1bb9f97..867c8a500276ef5661e05c65f3106db06be0ec7a 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -25,6 +25,7 @@
|
| #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
|
| #include "content/common/navigation_gesture.h"
|
| #include "content/common/view_message_enums.h"
|
| +#include "content/public/browser/javascript_message_type.h"
|
| #include "content/public/common/page_zoom.h"
|
| #include "content/public/common/referrer.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| @@ -48,7 +49,6 @@
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
|
| -#include "ui/base/javascript_message_type.h"
|
| #include "ui/surface/transport_dib.h"
|
| #include "webkit/glue/webpreferences.h"
|
| #include "webkit/media/webmediaplayer_delegate.h"
|
| @@ -827,7 +827,7 @@ class RenderViewImpl : public RenderWidget,
|
| const content::Referrer& referrer,
|
| WebKit::WebNavigationPolicy policy);
|
|
|
| - bool RunJavaScriptMessage(ui::JavascriptMessageType type,
|
| + bool RunJavaScriptMessage(content::JavaScriptMessageType type,
|
| const string16& message,
|
| const string16& default_value,
|
| const GURL& frame_url,
|
|
|