| 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..dc74a3aff3d29b018a4ecc9002a19dabae3a8592 100644
|
| --- a/content/renderer/render_view_impl_android.cc
|
| +++ b/content/renderer/render_view_impl_android.cc
|
| @@ -14,12 +14,12 @@
|
| 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);
|
| +static_assert(int(TOP_CONTROLS_STATE_SHOWN) == int(cc::SHOWN),
|
| + "mismatching enums: SHOWN");
|
| +static_assert(int(TOP_CONTROLS_STATE_HIDDEN) == int(cc::HIDDEN),
|
| + "mismatching enums: HIDDEN");
|
| +static_assert(int(TOP_CONTROLS_STATE_BOTH) == int(cc::BOTH),
|
| + "mismatching enums: BOTH");
|
|
|
| cc::TopControlsState ContentToCcTopControlsState(
|
| TopControlsState state) {
|
|
|