content/common/view_messages.h - Issue 10451047: content: Move javascript_message_type.h into content/ from ui/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/view_messages.h

Issue 10451047: content: Move javascript_message_type.h into content/ from ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 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 | « content/browser/web_contents/web_contents_impl_unittest.cc ('k') | content/content_browser.gypi » ('j') | content/public/browser/javascript_message_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/view_messages.h

diff --git a/content/common/view_messages.h b/content/common/view_messages.h

index e85bda17f875696c89baa6b0b07604f1c3c7e31d..f57a7763bcda0bdb0f2807a9a1d9d9e81ff1826b 100644

--- a/content/common/view_messages.h

+++ b/content/common/view_messages.h

@@ -12,6 +12,7 @@

#include "content/common/edit_command.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/common_param_traits.h"

#include "content/public/common/context_menu_params.h"

#include "content/public/common/file_chooser_params.h"

@@ -37,7 +38,6 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"

#include "ui/base/ime/text_input_type.h"

-#include "ui/base/javascript_message_type.h"

#include "ui/base/range/range.h"

#include "ui/gfx/point.h"

#include "ui/gfx/rect.h"

@@ -73,7 +73,7 @@ IPC_ENUM_TRAITS(content::RendererPreferencesSubpixelRenderingEnum)

IPC_ENUM_TRAITS(content::StopFindAction)

IPC_ENUM_TRAITS(media::MediaLogEvent::Type)

IPC_ENUM_TRAITS(ui::TextInputType)

-IPC_ENUM_TRAITS(ui::JavascriptMessageType)

+IPC_ENUM_TRAITS(content::JavaScriptMessageType)

jochen (gone - plz use gerrit) 2012/05/26 11:19:55 nit. alphabetical order

tfarina 2012/05/26 12:33:32 Done.

IPC_STRUCT_TRAITS_BEGIN(EditCommand)

IPC_STRUCT_TRAITS_MEMBER(name)

@@ -1664,7 +1664,7 @@ IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage,

string16 /* in - alert message */,

string16 /* in - default prompt */,

GURL /* in - originating page URL */,

- ui::JavascriptMessageType /* in - type */,

+ content::JavaScriptMessageType /* in - type */,

bool /* out - success */,

string16 /* out - user_input field */)