From 1d385f8d690761a3be22a0f417626938eff4821c Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Wed, 11 Apr 2018 16:52:15 -0700
Subject: [PATCH] Require goog.userAgent in the correct files.

---
 core/block_render_svg.js | 2 --
 core/block_svg.js        | 1 -
 core/blockly.js          | 1 -
 core/contextmenu.js      | 1 +
 core/field_image.js      | 1 -
 core/flyout_base.js      | 1 -
 core/workspace_audio.js  | 2 ++
 core/workspace_svg.js    | 1 -
 8 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/block_render_svg.js b/core/block_render_svg.js
index 355f1dc64..7dfc00b68 100644
--- a/core/block_render_svg.js
+++ b/core/block_render_svg.js
@@ -29,8 +29,6 @@ goog.provide('Blockly.BlockSvg.render');
 
 goog.require('Blockly.BlockSvg');
 
-goog.require('goog.userAgent');
-
 
 // UI constants for rendering blocks.
 /**
diff --git a/core/block_svg.js b/core/block_svg.js
index 64742b7a5..2e5727367 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -39,7 +39,6 @@ goog.require('goog.Timer');
 goog.require('goog.asserts');
 goog.require('goog.dom');
 goog.require('goog.math.Coordinate');
-goog.require('goog.userAgent');
 
 
 /**
diff --git a/core/blockly.js b/core/blockly.js
index f760caa54..ad6d61b87 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -55,7 +55,6 @@ goog.require('Blockly.inject');
 goog.require('Blockly.utils');
 
 goog.require('goog.color');
-goog.require('goog.userAgent');
 
 
 // Turn off debugging when compiled.
diff --git a/core/contextmenu.js b/core/contextmenu.js
index e950f6059..904dfe9c7 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -39,6 +39,7 @@ goog.require('goog.events');
 goog.require('goog.style');
 goog.require('goog.ui.Menu');
 goog.require('goog.ui.MenuItem');
+goog.require('goog.userAgent');
 
 
 /**
diff --git a/core/field_image.js b/core/field_image.js
index 8389b039d..b41e5ca91 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -29,7 +29,6 @@ goog.provide('Blockly.FieldImage');
 goog.require('Blockly.Field');
 goog.require('goog.dom');
 goog.require('goog.math.Size');
-goog.require('goog.userAgent');
 
 
 /**
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 0924412b7..ea21ec8bf 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -37,7 +37,6 @@ goog.require('Blockly.WorkspaceSvg');
 goog.require('goog.dom');
 goog.require('goog.events');
 goog.require('goog.math.Rect');
-goog.require('goog.userAgent');
 
 
 /**
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index fe9cae27a..fff9b3482 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -27,6 +27,8 @@
 
 goog.provide('Blockly.WorkspaceAudio');
 
+goog.require('goog.userAgent');
+
 
 /**
  * Class for loading, storing, and playing audio for a workspace.
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index d74586c31..c3e10c987 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -48,7 +48,6 @@ goog.require('Blockly.ZoomControls');
 goog.require('goog.array');
 goog.require('goog.dom');
 goog.require('goog.math.Coordinate');
-goog.require('goog.userAgent');
 
 
 /**