Commit c806854f authored by mlamouri's avatar mlamouri Committed by Commit bot

Create org.chromium.content_public.common and move two classes there.

ScreenOrientationValues and Referrer are being moved there. Another
class regarding shortcuts and default orientaiton will also be added.

BUG=366145
TBR=avi@chromium.org (for content/content.gyp)

Review URL: https://codereview.chromium.org/584523003

Cr-Commit-Position: refs/heads/master@{#295473}
parent 446f584e
...@@ -50,7 +50,6 @@ import org.chromium.content.browser.ContentViewCore; ...@@ -50,7 +50,6 @@ import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.ContentViewStatics; import org.chromium.content.browser.ContentViewStatics;
import org.chromium.content.browser.WebContentsObserverAndroid; import org.chromium.content.browser.WebContentsObserverAndroid;
import org.chromium.content.common.CleanupReference; import org.chromium.content.common.CleanupReference;
import org.chromium.content_public.Referrer;
import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.GestureStateListener;
import org.chromium.content_public.browser.JavaScriptCallback; import org.chromium.content_public.browser.JavaScriptCallback;
import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.LoadUrlParams;
...@@ -58,6 +57,7 @@ import org.chromium.content_public.browser.NavigationController; ...@@ -58,6 +57,7 @@ import org.chromium.content_public.browser.NavigationController;
import org.chromium.content_public.browser.NavigationHistory; import org.chromium.content_public.browser.NavigationHistory;
import org.chromium.content_public.browser.PageTransitionTypes; import org.chromium.content_public.browser.PageTransitionTypes;
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.common.Referrer;
import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.gfx.DeviceDisplayInfo; import org.chromium.ui.gfx.DeviceDisplayInfo;
......
...@@ -50,8 +50,8 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ ...@@ -50,8 +50,8 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/PopupItemType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/PopupItemType.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ScreenOrientationValues.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/browser/PageTransitionTypes.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/browser/PageTransitionTypes.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \
......
...@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.contextmenu; ...@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.contextmenu;
import org.chromium.chrome.browser.Tab; import org.chromium.chrome.browser.Tab;
import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewCore;
import org.chromium.content_public.Referrer; import org.chromium.content_public.common.Referrer;
/** /**
* A delegate responsible for taking actions based on context menu selections. * A delegate responsible for taking actions based on context menu selections.
......
...@@ -8,7 +8,7 @@ import android.text.TextUtils; ...@@ -8,7 +8,7 @@ import android.text.TextUtils;
import org.chromium.base.CalledByNative; import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace; import org.chromium.base.JNINamespace;
import org.chromium.content_public.Referrer; import org.chromium.content_public.common.Referrer;
import java.util.ArrayList; import java.util.ArrayList;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package org.chromium.chrome.browser.contextmenu; package org.chromium.chrome.browser.contextmenu;
import org.chromium.content_public.Referrer; import org.chromium.content_public.common.Referrer;
/** /**
* An empty implementation of {@link ChromeContextMenuItemDelegate} to make overriding subsets of * An empty implementation of {@link ChromeContextMenuItemDelegate} to make overriding subsets of
......
...@@ -13,10 +13,10 @@ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator; ...@@ -13,10 +13,10 @@ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator;
import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator; import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
import org.chromium.chrome.browser.infobar.AutoLoginProcessor; import org.chromium.chrome.browser.infobar.AutoLoginProcessor;
import org.chromium.content.browser.ContentViewClient; import org.chromium.content.browser.ContentViewClient;
import org.chromium.content_public.Referrer;
import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationController;
import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.common.Referrer;
import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.base.WindowAndroid;
/** /**
......
...@@ -552,10 +552,10 @@ ...@@ -552,10 +552,10 @@
'target_name': 'screen_orientation_values_java', 'target_name': 'screen_orientation_values_java',
'type': 'none', 'type': 'none',
'sources': [ 'sources': [
'public/android/java/src/org/chromium/content/common/ScreenOrientationValues.template', 'public/android/java/src/org/chromium/content_public/common/ScreenOrientationValues.template',
], ],
'variables': { 'variables': {
'package_name': 'org/chromium/content/common', 'package_name': 'org/chromium/content_public/common',
'template_deps': ['public/common/screen_orientation_values_list.h'], 'template_deps': ['public/common/screen_orientation_values_list.h'],
}, },
'includes': [ '../build/android/java_cpp_template.gypi' ], 'includes': [ '../build/android/java_cpp_template.gypi' ],
......
...@@ -183,9 +183,9 @@ java_cpp_template("top_controls_state_java") { ...@@ -183,9 +183,9 @@ java_cpp_template("top_controls_state_java") {
java_cpp_template("screen_orientation_values_java") { java_cpp_template("screen_orientation_values_java") {
sources = [ sources = [
"java/src/org/chromium/content/common/ScreenOrientationValues.template", "java/src/org/chromium/content_public/common/ScreenOrientationValues.template",
] ]
package_name = "org/chromium/content/common" package_name = "org/chromium/content_public/common"
inputs = [ inputs = [
"//content/public/common/screen_orientation_values_list.h" "//content/public/common/screen_orientation_values_list.h"
] ]
......
...@@ -13,7 +13,7 @@ import org.chromium.base.ApplicationStatus; ...@@ -13,7 +13,7 @@ import org.chromium.base.ApplicationStatus;
import org.chromium.base.CalledByNative; import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace; import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.content.common.ScreenOrientationValues; import org.chromium.content_public.common.ScreenOrientationValues;
/** /**
* This is the implementation of the C++ counterpart ScreenOrientationProvider. * This is the implementation of the C++ counterpart ScreenOrientationProvider.
......
...@@ -6,7 +6,7 @@ package org.chromium.content_public.browser; ...@@ -6,7 +6,7 @@ package org.chromium.content_public.browser;
import org.chromium.base.CalledByNative; import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace; import org.chromium.base.JNINamespace;
import org.chromium.content_public.Referrer; import org.chromium.content_public.common.Referrer;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
...@@ -411,18 +411,18 @@ public class LoadUrlParams { ...@@ -411,18 +411,18 @@ public class LoadUrlParams {
@SuppressWarnings("unused") @SuppressWarnings("unused")
@CalledByNative @CalledByNative
private static void initializeConstants( private static void initializeConstants(
int load_type_default, int loadTypeDefault,
int load_type_browser_initiated_http_post, int loadTypeBrowserInitiatedHttpPost,
int load_type_data, int loadTypeData,
int ua_override_inherit, int uaOverrideInherit,
int ua_override_false, int uaOverrideFalse,
int ua_override_true) { int uaOverrideTrue) {
assert LOAD_TYPE_DEFAULT == load_type_default; assert LOAD_TYPE_DEFAULT == loadTypeDefault;
assert LOAD_TYPE_BROWSER_INITIATED_HTTP_POST == load_type_browser_initiated_http_post; assert LOAD_TYPE_BROWSER_INITIATED_HTTP_POST == loadTypeBrowserInitiatedHttpPost;
assert LOAD_TYPE_DATA == load_type_data; assert LOAD_TYPE_DATA == loadTypeData;
assert UA_OVERRIDE_INHERIT == ua_override_inherit; assert UA_OVERRIDE_INHERIT == uaOverrideInherit;
assert UA_OVERRIDE_FALSE == ua_override_false; assert UA_OVERRIDE_FALSE == uaOverrideFalse;
assert UA_OVERRIDE_TRUE == ua_override_true; assert UA_OVERRIDE_TRUE == uaOverrideTrue;
} }
/** /**
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.content_public; package org.chromium.content_public.common;
/** /**
* Container that holds together a referrer URL along with the referrer policy set on the * Container that holds together a referrer URL along with the referrer policy set on the
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.content.common; package org.chromium.content_public.common;
public class ScreenOrientationValues { public class ScreenOrientationValues {
#define DEFINE_SCREEN_ORIENTATION_VALUE(name, value) public static final int name = value; #define DEFINE_SCREEN_ORIENTATION_VALUE(name, value) public static final int name = value;
......
...@@ -12,7 +12,7 @@ import org.chromium.base.test.util.UrlUtils; ...@@ -12,7 +12,7 @@ import org.chromium.base.test.util.UrlUtils;
import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.MockOrientationObserver; import org.chromium.content.browser.test.util.MockOrientationObserver;
import org.chromium.content.browser.test.util.OrientationChangeObserverCriteria; import org.chromium.content.browser.test.util.OrientationChangeObserverCriteria;
import org.chromium.content.common.ScreenOrientationValues; import org.chromium.content_public.common.ScreenOrientationValues;
import org.chromium.content_shell_apk.ContentShellActivity; import org.chromium.content_shell_apk.ContentShellActivity;
import org.chromium.content_shell_apk.ContentShellTestBase; import org.chromium.content_shell_apk.ContentShellTestBase;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment