content/renderer/render_view_impl_android.cc - Issue 615893003: Use the new java_cpp_enum rule in content.

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/renderer/render_view_impl_android.cc

Issue 615893003: Use the new java_cpp_enum rule in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android_aosp 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:

Index: content/renderer/render_view_impl_android.cc

diff --git a/content/renderer/render_view_impl_android.cc b/content/renderer/render_view_impl_android.cc

index 57d1920f5bd61875b784d0b7887fee517310568b..50b10aa56672186ed97dffeb74168a3a27eb2380 100644

--- a/content/renderer/render_view_impl_android.cc

+++ b/content/renderer/render_view_impl_android.cc

@@ -14,9 +14,12 @@

namespace content {

// Check content::TopControlsState and cc::TopControlsState are kept in sync.

-COMPILE_ASSERT(int(SHOWN) == int(cc::SHOWN), mismatching_enums);

-COMPILE_ASSERT(int(HIDDEN) == int(cc::HIDDEN), mismatching_enums);

-COMPILE_ASSERT(int(BOTH) == int(cc::BOTH), mismatching_enums);

+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),

+ mismatching_enums);

+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),

+ mismatching_enums);

+COMPILE_ASSERT(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),

+ mismatching_enums);

cc::TopControlsState ContentToCcTopControlsState(

TopControlsState state) {