[orca/gnome-3-16] Use the default object generation for ROLE_EMBEDDED

[Joanmarie Diggs <joanied src gnome org>]

commit 4e9ab6229933aeff1b823082899fa4e29a761201
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Mar 11 22:36:05 2015 -0400

    Use the default object generation for ROLE_EMBEDDED
    
    It seems we were trying to be clever, but all we were succeeding in
    doing is presenting web apps as the browser. We can refine what we
    present given real-world use cases. For now, it seems best to not
    confuse users with bogus information.

 src/orca/formatting.py       |    8 --------
 src/orca/speech_generator.py |   17 -----------------
 2 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/src/orca/formatting.py b/src/orca/formatting.py
index 111a734..4410753 100644
--- a/src/orca/formatting.py
+++ b/src/orca/formatting.py
@@ -152,10 +152,6 @@ formatting = {
             'basicWhereAmI': 'label + readOnly + textRole + textContent + anyTextSelection + ' + MNEMONIC,
             'detailedWhereAmI': 'label + readOnly + textRole + textContentWithAttributes + anyTextSelection 
+ ' + MNEMONIC + ' + ' + TUTORIAL
             },
-        pyatspi.ROLE_EMBEDDED: {
-            'focused': 'embedded',
-            'unfocused': 'embedded'
-            },
         pyatspi.ROLE_ENTRY: {
             'focused': 'labelOrName + placeholderText + readOnly + textRole + currentLineText + 
allTextSelection',
             'unfocused': 'labelOrName + placeholderText + readOnly + textRole + currentLineText + 
allTextSelection + ' + MNEMONIC,
@@ -447,10 +443,6 @@ formatting = {
                           + (readOnly and [Region(" " + asString(readOnly))])',
             'unfocused': BRAILLE_TEXT
             },
-        pyatspi.ROLE_EMBEDDED: {
-            'unfocused': '[Component(obj,\
-                                     asString(label + displayedText) or asString(applicationName))]'
-            },
         pyatspi.ROLE_ENTRY: {
             'unfocused': BRAILLE_TEXT
             },
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index cedecf9..d853ae9 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -389,23 +389,6 @@ class SpeechGenerator(generator.Generator):
             result.extend(acss)
         return result
 
-    def _generateEmbedded(self, obj, **args):
-        """Returns an array of strings (and possibly voice and audio
-        specifications) used especially for handling embedded objects.
-        This either is the label or name of the object or the name of
-        the application for the object.
-        """
-        acss = self.voice(DEFAULT)
-        result = self._generateLabelOrName(obj, **args)
-        if not result:
-            try:
-                result.append(obj.getApplication().name)
-            except:
-                pass
-        if result:
-            result.extend(acss)
-        return result
-
     #####################################################################
     #                                                                   #
     # State information                                                 #