Federico Simoncelli has uploaded a new change for review. Change subject: [wip] webadmin: enable the spice-xpi extension for chrome ......................................................................
[wip] webadmin: enable the spice-xpi extension for chrome This patch, in combination with the spice-xpi patches posted upstream: http://lists.freedesktop.org/archives/spice-devel/2012-December/011729.html adds the support for the chrome (and chromium browser). Change-Id: I47f81d8a632dfa52b38bfd9f6ba4dd99244b9024 Signed-off-by: Federico Simoncelli <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceInterfaceImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/9679/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceInterfaceImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceInterfaceImpl.java index a6bc9c7..cc199fc 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceInterfaceImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceInterfaceImpl.java @@ -448,11 +448,10 @@ public void Connect() { logger.warning("Connecting via spice..."); //$NON-NLS-1$ - if ((cat.os.equalsIgnoreCase("Linux")) //$NON-NLS-1$ - && (cat.browser.equalsIgnoreCase("Firefox"))) { //$NON-NLS-1$ + if (cat.browser.equalsIgnoreCase("Firefox") || //$NON-NLS-1$ + cat.browser.equalsIgnoreCase("Chrome")) { //$NON-NLS-1$ connectNativelyViaXPI(); - } else if ((cat.os.equalsIgnoreCase("Windows")) //$NON-NLS-1$ - && (cat.browser.equalsIgnoreCase("Explorer"))) { //$NON-NLS-1$ + } else if (cat.browser.equalsIgnoreCase("Explorer")) { //$NON-NLS-1$ connectNativelyViaActiveX(); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java index c49ea8c..3123998 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java @@ -376,8 +376,9 @@ return true; case qxl: - return (clientOsType().equalsIgnoreCase("Windows") && clientBrowserType().equalsIgnoreCase("Explorer")) || //$NON-NLS-1$ //$NON-NLS-2$ - (clientOsType().equalsIgnoreCase("Linux") && clientBrowserType().equalsIgnoreCase("Firefox")); //$NON-NLS-1$ //$NON-NLS-2$ + return (clientBrowserType().equalsIgnoreCase("Firefox") || //$NON-NLS-1$ + clientBrowserType().equalsIgnoreCase("Explorer") || //$NON-NLS-1$ + clientBrowserType().equalsIgnoreCase("Chrome")); //$NON-NLS-1$ } return false; -- To view, visit http://gerrit.ovirt.org/9679 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47f81d8a632dfa52b38bfd9f6ba4dd99244b9024 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
