summaryrefslogtreecommitdiffstats
path: root/content/browser/android
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2014-10-02 03:08:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-02 10:09:12 +0000
commit4db84b031042bf4f99720372f657ff53e4503a16 (patch)
tree5404610852e9b896fd411729e49d4b9adf4e31d8 /content/browser/android
parent949b6e5050c7a2ee2a894799db19ec325ba911ef (diff)
downloadchromium_src-4db84b031042bf4f99720372f657ff53e4503a16.zip
chromium_src-4db84b031042bf4f99720372f657ff53e4503a16.tar.gz
chromium_src-4db84b031042bf4f99720372f657ff53e4503a16.tar.bz2
Revert of Revert of Use the new java_cpp_enum rule in content. (patchset #1 id:1 of https://codereview.chromium.org/625543002/)
Reason for revert: Oops, wasn't supposed to revert this after all. Original issue's description: > Revert of Use the new java_cpp_enum rule in content. (patchset #8 id:140001 of https://codereview.chromium.org/615893003/) > > Reason for revert: > Fails to compile on several bots: > > https://chromegw.corp.google.com/i/clank.tot/builders/clang-clankium-tot-builder/builds/56800/steps/compile/logs/stdio > > First error: > FAILED: cd ../../clank/native/framework; python <snip ...> > ../../../clank/java/apps/chrome/src/com/google/android/apps/chrome/webapps/FullScreenActivityTab.java:28: error: cannot find symbol > import org.chromium.content.common.TopControlsState; > ^ > symbol: class TopControlsState > location: package org.chromium.content.common > > Original issue's description: > > Use the new java_cpp_enum rule in content. > > > > This moves most of the generated Java enums under content/ to use the > > java_cpp_enum rule removing the need for keeping the enums in > > separate list files and the need for the .template files. > > > > BUG=405532, 351558 > > > > Committed: https://crrev.com/7d5f0a581ba2f0e79b09ecbf6127ad453a861a96 > > Cr-Commit-Position: refs/heads/master@{#297789} > > TBR=jam@chromium.org,yfriedman@chromium.org,scottmg@chromium.org,jdduke@chromium.org,brettw@chromium.org,mkosiba@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=405532, 351558 > > Committed: https://crrev.com/949b6e5050c7a2ee2a894799db19ec325ba911ef > Cr-Commit-Position: refs/heads/master@{#297793} TBR=jam@chromium.org,yfriedman@chromium.org,scottmg@chromium.org,jdduke@chromium.org,brettw@chromium.org,mkosiba@chromium.org,perezju@chromium.org NOTREECHECKS=true NOTRY=true BUG=405532, 351558 Review URL: https://codereview.chromium.org/617103007 Cr-Commit-Position: refs/heads/master@{#297794}
Diffstat (limited to 'content/browser/android')
-rw-r--r--content/browser/android/content_view_core_impl.cc47
-rw-r--r--content/browser/android/gesture_event_type.h27
-rw-r--r--content/browser/android/gesture_event_type_list.h33
-rw-r--r--content/browser/android/popup_item_type_list.h23
4 files changed, 51 insertions, 79 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 9cd9679..d002203 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -70,10 +70,17 @@ using blink::WebInputEvent;
// Describes the type and enabled state of a select popup item.
namespace {
-enum {
-#define DEFINE_POPUP_ITEM_TYPE(name, value) POPUP_ITEM_TYPE_##name = value,
-#include "content/browser/android/popup_item_type_list.h"
-#undef DEFINE_POPUP_ITEM_TYPE
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.content.browser.input
+enum PopupItemType {
+ // Popup item is of type group
+ POPUP_ITEM_TYPE_GROUP,
+
+ // Popup item is disabled
+ POPUP_ITEM_TYPE_DISABLED,
+
+ // Popup item is enabled
+ POPUP_ITEM_TYPE_ENABLED,
};
} //namespace
@@ -108,37 +115,37 @@ ScopedJavaLocalRef<jobject> CreateJavaRect(
int ToGestureEventType(WebInputEvent::Type type) {
switch (type) {
case WebInputEvent::GestureScrollBegin:
- return SCROLL_START;
+ return GESTURE_EVENT_TYPE_SCROLL_START;
case WebInputEvent::GestureScrollEnd:
- return SCROLL_END;
+ return GESTURE_EVENT_TYPE_SCROLL_END;
case WebInputEvent::GestureScrollUpdate:
- return SCROLL_BY;
+ return GESTURE_EVENT_TYPE_SCROLL_BY;
case WebInputEvent::GestureFlingStart:
- return FLING_START;
+ return GESTURE_EVENT_TYPE_FLING_START;
case WebInputEvent::GestureFlingCancel:
- return FLING_CANCEL;
+ return GESTURE_EVENT_TYPE_FLING_CANCEL;
case WebInputEvent::GestureShowPress:
- return SHOW_PRESS;
+ return GESTURE_EVENT_TYPE_SHOW_PRESS;
case WebInputEvent::GestureTap:
- return SINGLE_TAP_CONFIRMED;
+ return GESTURE_EVENT_TYPE_SINGLE_TAP_CONFIRMED;
case WebInputEvent::GestureTapUnconfirmed:
- return SINGLE_TAP_UNCONFIRMED;
+ return GESTURE_EVENT_TYPE_SINGLE_TAP_UNCONFIRMED;
case WebInputEvent::GestureTapDown:
- return TAP_DOWN;
+ return GESTURE_EVENT_TYPE_TAP_DOWN;
case WebInputEvent::GestureTapCancel:
- return TAP_CANCEL;
+ return GESTURE_EVENT_TYPE_TAP_CANCEL;
case WebInputEvent::GestureDoubleTap:
- return DOUBLE_TAP;
+ return GESTURE_EVENT_TYPE_DOUBLE_TAP;
case WebInputEvent::GestureLongPress:
- return LONG_PRESS;
+ return GESTURE_EVENT_TYPE_LONG_PRESS;
case WebInputEvent::GestureLongTap:
- return LONG_TAP;
+ return GESTURE_EVENT_TYPE_LONG_TAP;
case WebInputEvent::GesturePinchBegin:
- return PINCH_BEGIN;
+ return GESTURE_EVENT_TYPE_PINCH_BEGIN;
case WebInputEvent::GesturePinchEnd:
- return PINCH_END;
+ return GESTURE_EVENT_TYPE_PINCH_END;
case WebInputEvent::GesturePinchUpdate:
- return PINCH_BY;
+ return GESTURE_EVENT_TYPE_PINCH_BY;
case WebInputEvent::GestureTwoFingerTap:
case WebInputEvent::GestureScrollUpdateWithoutPropagation:
default:
diff --git a/content/browser/android/gesture_event_type.h b/content/browser/android/gesture_event_type.h
index d41311c..ce87c90 100644
--- a/content/browser/android/gesture_event_type.h
+++ b/content/browser/android/gesture_event_type.h
@@ -7,10 +7,31 @@
namespace content {
+// This file contains a list of GestureEventType's usable by ContentViewCore,
+// providing a direct mapping to and from their corresponding
+// blink::WebGestureEvent types.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.content.browser
enum GestureEventType {
-#define DEFINE_GESTURE_EVENT_TYPE(name, value) name = value,
-#include "content/browser/android/gesture_event_type_list.h"
-#undef DEFINE_GESTURE_EVENT_TYPE
+ GESTURE_EVENT_TYPE_SHOW_PRESS,
+ GESTURE_EVENT_TYPE_DOUBLE_TAP,
+ GESTURE_EVENT_TYPE_SINGLE_TAP_UP,
+ GESTURE_EVENT_TYPE_SINGLE_TAP_CONFIRMED,
+ GESTURE_EVENT_TYPE_SINGLE_TAP_UNCONFIRMED,
+ GESTURE_EVENT_TYPE_LONG_PRESS,
+ GESTURE_EVENT_TYPE_SCROLL_START,
+ GESTURE_EVENT_TYPE_SCROLL_BY,
+ GESTURE_EVENT_TYPE_SCROLL_END,
+ GESTURE_EVENT_TYPE_FLING_START,
+ GESTURE_EVENT_TYPE_FLING_CANCEL,
+ GESTURE_EVENT_TYPE_FLING_END,
+ GESTURE_EVENT_TYPE_PINCH_BEGIN,
+ GESTURE_EVENT_TYPE_PINCH_BY,
+ GESTURE_EVENT_TYPE_PINCH_END,
+ GESTURE_EVENT_TYPE_TAP_CANCEL,
+ GESTURE_EVENT_TYPE_LONG_TAP,
+ GESTURE_EVENT_TYPE_TAP_DOWN,
};
} // namespace content
diff --git a/content/browser/android/gesture_event_type_list.h b/content/browser/android/gesture_event_type_list.h
deleted file mode 100644
index 85af616..0000000
--- a/content/browser/android/gesture_event_type_list.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file intentionally does not have header guards because this file
-// is meant to be included inside a macro to generate enum values.
-
-// This file contains a list of GestureEventType's usable by ContentViewCore,
-// providing a direct mapping to and from their corresponding
-// blink::WebGestureEvent types.
-
-#ifndef DEFINE_GESTURE_EVENT_TYPE
-#error "Please define DEFINE_GESTURE_EVENT_TYPE before including this file."
-#endif
-
-DEFINE_GESTURE_EVENT_TYPE(SHOW_PRESS, 0)
-DEFINE_GESTURE_EVENT_TYPE(DOUBLE_TAP, 1)
-DEFINE_GESTURE_EVENT_TYPE(SINGLE_TAP_UP, 2)
-DEFINE_GESTURE_EVENT_TYPE(SINGLE_TAP_CONFIRMED, 3)
-DEFINE_GESTURE_EVENT_TYPE(SINGLE_TAP_UNCONFIRMED, 4)
-DEFINE_GESTURE_EVENT_TYPE(LONG_PRESS, 5)
-DEFINE_GESTURE_EVENT_TYPE(SCROLL_START, 6)
-DEFINE_GESTURE_EVENT_TYPE(SCROLL_BY, 7)
-DEFINE_GESTURE_EVENT_TYPE(SCROLL_END, 8)
-DEFINE_GESTURE_EVENT_TYPE(FLING_START, 9)
-DEFINE_GESTURE_EVENT_TYPE(FLING_CANCEL, 10)
-DEFINE_GESTURE_EVENT_TYPE(FLING_END, 11)
-DEFINE_GESTURE_EVENT_TYPE(PINCH_BEGIN, 12)
-DEFINE_GESTURE_EVENT_TYPE(PINCH_BY, 13)
-DEFINE_GESTURE_EVENT_TYPE(PINCH_END, 14)
-DEFINE_GESTURE_EVENT_TYPE(TAP_CANCEL, 15)
-DEFINE_GESTURE_EVENT_TYPE(LONG_TAP, 16)
-DEFINE_GESTURE_EVENT_TYPE(TAP_DOWN, 17)
diff --git a/content/browser/android/popup_item_type_list.h b/content/browser/android/popup_item_type_list.h
deleted file mode 100644
index 3f50490..0000000
--- a/content/browser/android/popup_item_type_list.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file intentionally does not have header guards because this file
-// is meant to be included inside a macro to generate enum values.
-
-// This file contains a list of sync PopupItemTypes which describe the type
-// and enabled state of a select popup item. List is used by Android when
-// displaying a new select popup menu.
-
-#ifndef DEFINE_POPUP_ITEM_TYPE
-#error "Please define DEFINE_POPUP_ITEM_TYPE before including this file."
-#endif
-
-// Popup item is of type group
-DEFINE_POPUP_ITEM_TYPE(GROUP, 0)
-
-// Popup item is disabled
-DEFINE_POPUP_ITEM_TYPE(DISABLED, 1)
-
-// Popup item is enabled
-DEFINE_POPUP_ITEM_TYPE(ENABLED, 2)
generated by cgit v1.1 at 2025-03-26 05:49:01 +0000