Revert 101688 (revert didn't help)

- Revert 101652 (speculative revert; reliability went red after
this went in. Reliability is win, and this CL is cros, so chances
are I can revert the revert soon, but let's give it a try.)

- [cros] Disable text selection/dragging in mobile dialogs.

BUG=chromium-os:17501
TEST=Manual


Review URL: http://codereview.chromium.org/7901013

TBR=nkostylev@chromium.org
Review URL: http://codereview.chromium.org/7936001

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/7931017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101699 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 9 deletions

diff --git a/chrome/browser/resources/chromeos/choose_mobile_network.js b/chrome/browser/resources/chromeos/choose_mobile_network.js
index cb163c2..606ee87 100644
--- a/chrome/browser/resources/chromeos/choose_mobile_network.js
+++ b/chrome/browser/resources/chromeos/choose_mobile_network.js
@@ -116,3 +116,5 @@ document.addEventListener('DOMContentLoaded', function () {
 
   ChooseNetwork.initialize();
 });
+
+disableTextSelectAndDrag();
diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js
index bc1d461..26243789 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -595,14 +595,6 @@ cr.define('cr.ui', function() {
 
 var Oobe = cr.ui.Oobe;
 
-// Disable text selection.
-document.onselectstart = function(e) {
-  e.preventDefault();
-}
-
-// Disable dragging.
-document.ondragstart = function(e) {
-  e.preventDefault();
-}
+disableTextSelectAndDrag();
 
 document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize);
diff --git a/chrome/browser/resources/chromeos/sim_unlock.js b/chrome/browser/resources/chromeos/sim_unlock.js
index 3d64aa8..22c4dd1 100644
--- a/chrome/browser/resources/chromeos/sim_unlock.js
+++ b/chrome/browser/resources/chromeos/sim_unlock.js
@@ -415,3 +415,5 @@ cr.define('mobile', function() {
   };
 
 });
+
+disableTextSelectAndDrag();
\ No newline at end of file
diff --git a/chrome/browser/resources/shared/js/util.js b/chrome/browser/resources/shared/js/util.js
index 8956f7b..24a30f1 100644
--- a/chrome/browser/resources/shared/js/util.js
+++ b/chrome/browser/resources/shared/js/util.js
@@ -108,6 +108,21 @@ function swapDomNodes(a, b) {
   aParent.insertBefore(b, afterA);
 }
 
+/**
+ * Disables text selection and dragging.
+ */
+function disableTextSelectAndDrag() {
+  // Disable text selection.
+  document.onselectstart = function(e) {
+    e.preventDefault();
+  }
+
+  // Disable dragging.
+  document.ondragstart = function(e) {
+    e.preventDefault();
+  }
+}
+
 // Handle click on a link. If the link points to a chrome: or file: url, then
 // call into the browser to do the navigation.
 document.addEventListener('click', function(e) {