content/public/common/common_param_traits_macros.h - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

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/public/common/common_param_traits_macros.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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

Index: content/public/common/common_param_traits_macros.h

diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h

index eede5048ac03fba13045eed7982ee6769a7d8082..1d045b0f484a47270cc9824fe13e4e9f56188368 100644

--- a/content/public/common/common_param_traits_macros.h

+++ b/content/public/common/common_param_traits_macros.h

@@ -9,7 +9,6 @@

#define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_

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

-#include "content/public/common/page_transition_types.h"

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

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

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

@@ -23,12 +22,13 @@

#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"

#include "third_party/WebKit/public/platform/WebURLRequest.h"

#include "third_party/WebKit/public/web/WebWindowFeatures.h"

+#include "ui/base/page_transition_types.h"

#include "ui/base/window_open_disposition.h"

#undef IPC_MESSAGE_EXPORT

#define IPC_MESSAGE_EXPORT CONTENT_EXPORT

-IPC_ENUM_TRAITS(content::PageTransition) // Bitmask.

+IPC_ENUM_TRAITS(ui::PageTransition) // Bitmask.

IPC_ENUM_TRAITS_MAX_VALUE(net::NetworkChangeNotifier::ConnectionType,

net::NetworkChangeNotifier::CONNECTION_LAST)

IPC_ENUM_TRAITS_MAX_VALUE(content::ConsoleMessageLevel,

« no previous file with comments | « content/public/browser/web_ui.h ('k') | content/public/common/frame_navigate_params.h » ('j') | no next file with comments »