Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Unified Diff: content/renderer/render_view_impl_android.cc

Issue 625543002: Revert of Use the new java_cpp_enum rule in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/public/common/top_controls_state_list.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 50b10aa56672186ed97dffeb74168a3a27eb2380..57d1920f5bd61875b784d0b7887fee517310568b 100644
--- a/content/renderer/render_view_impl_android.cc
+++ b/content/renderer/render_view_impl_android.cc
@@ -14,12 +14,9 @@
namespace content {
// Check content::TopControlsState and cc::TopControlsState are kept in sync.
-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);
+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);
cc::TopControlsState ContentToCcTopControlsState(
TopControlsState state) {
« no previous file with comments | « content/public/common/top_controls_state_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698