Revert 275229 "Add an extension override bubble and warning box ..."

> Add an extension override bubble and warning box for proxy extensions.
> 
> Also use the browser action highlighting for extensions that have a browser action icon.
> 
> BUG=381291
> R=dbeam@chromium.org, rdevlin.cronin@chromium.org, sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/288923004

TBR=finnur@chromium.org

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

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

chrome/app/generated_resources.grd

@@ -5169,18 +5169,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Is this the new tab page you were expecting?
         </message>
       </if>
-      <if expr="use_titlecase">
-        <message name="IDS_EXTENSIONS_PROXY_CONTROLLED_TITLE_HOME_PAGE_BUBBLE" desc="In Title Case: Title of a bubble warning users that an extension has overridden their proxy setting">
-        Your Internet Connection is Being Controlled
-        </message>
-      </if>
-      <if expr="not use_titlecase">
-        <message name="IDS_EXTENSIONS_PROXY_CONTROLLED_TITLE_HOME_PAGE_BUBBLE" desc="Title of a bubble warning users that an extension has overridden their proxy setting">
-          Your Internet connection is being controlled
-        </message>
-      </if>
 
-      <message name="IDS_EXTENSIONS_SETTINGS_API_FIRST_LINE_SEARCH_ENGINE" desc="Text displayed as the first line in the Settings API bubble when an extension has changed the search engine.">
+      <message name="IDS_EXTENSIONS_SETTINGS_API_FIRST_LINE_SEARCH_ENGINE" desc="Text displayed in the Settings API bubble as first line when an extension has changed the search engine.">
         An extension has changed what page is shown when you search from the Omnibox.
       </message>
       <message name="IDS_EXTENSIONS_SETTINGS_API_FIRST_LINE_HOME_PAGE" desc="Text displayed in the Settings API bubble as first line when an extension has changed the home page.">
@@ -5197,17 +5187,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
         ''' It also controls what page is shown when you click the Home button or search from the Omnibox. '''
       </message>
 
-      <message name="IDS_EXTENSIONS_NTP_CONTROLLED_FIRST_LINE" desc="Text displayed as the first line in the NTP bubble when an extension has changed the new tab page.">
+      <message name="IDS_EXTENSIONS_NTP_CONTROLLED_FIRST_LINE" desc="Text displayed in the Settings API bubble as first line when an extension has changed the new tab page.">
         An extension has changed what page is shown when you open a new tab.
       </message>
 
-      <message name="IDS_EXTENSIONS_PROXY_CONTROLLED_FIRST_LINE" desc="Text displayed as the first line in the proxy bubble when an extension has changed the proxy but we are not pointing at it's icon (because it doesn't have one).">
-        An extension has taken control of your proxy settings, which means it can change, break, or eavesdrop on anything you do online. If you aren't sure why this change happened, you probably don't want it.
-      </message>
-      <message name="IDS_EXTENSIONS_PROXY_CONTROLLED_FIRST_LINE_EXTENSION_SPECIFIC" desc="Text displayed as the first line in the proxy bubble when an extension has changed the proxy and we are pointing at that extension's icon.">
-        This extension has taken control of your proxy settings, which means it can change, break, or eavesdrop on anything you do online. If you aren't sure why this change happened, you probably don't want it.
-      </message>
-
       <message name="IDS_EXTENSIONS_SETTINGS_API_THIRD_LINE_CONFIRMATION" desc="Third line in the Settings API bubble, always appended after the first (and optional second) line to make one paragraph. See IDS_EXTENSIONS_SETTINGS_API_SECOND_LINE_SEARCH_ENGINE for reason for triple quotes.">
         ''' If you didn't want these changes, you can restore your previous settings.'''
       </message>
@@ -9660,9 +9643,6 @@ Chrome ran out of memory.
         <message name="IDS_OPTIONS_STARTUP_USE_CURRENT" desc="The label of the 'Use Current' button for the custom startup urls list">
           Use current pages
         </message>
-        <message name="IDS_OPTIONS_PROXY_GROUP_NAME" desc="The title of the Proxy group">
-          Proxy
-        </message>
         <message name="IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES" desc="The label of the 'Manage search engines' button">
           Manage search engines...
         </message>

chrome/browser/extensions/dev_mode_bubble_controller.cc

@@ -45,8 +45,7 @@ class DevModeBubbleDelegate
   virtual void PerformAction(const ExtensionIdList& list) OVERRIDE;
   virtual void OnClose() OVERRIDE;
   virtual base::string16 GetTitle() const OVERRIDE;
-  virtual base::string16 GetMessageBody(
-      bool anchored_to_browser_action) const OVERRIDE;
+  virtual base::string16 GetMessageBody() const OVERRIDE;
   virtual base::string16 GetOverflowText(
       const base::string16& overflow_count) const OVERRIDE;
   virtual base::string16 GetLearnMoreLabel() const OVERRIDE;
@@ -103,8 +102,7 @@ base::string16 DevModeBubbleDelegate::GetTitle() const {
   return l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE_DEVELOPER_MODE_TITLE);
 }
 
-base::string16 DevModeBubbleDelegate::GetMessageBody(
-    bool anchored_to_browser_action) const {
+base::string16 DevModeBubbleDelegate::GetMessageBody() const {
   return l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE_DEVELOPER_MODE_BODY);
 }
 

chrome/browser/extensions/extension_message_bubble_controller.h

@@ -42,13 +42,7 @@ class ExtensionMessageBubbleController {
 
     // Text for various UI labels shown in the bubble.
     virtual base::string16 GetTitle() const = 0;
-    // Fetches the message to show in the body. |anchored_to_browser_action|
-    // will be true if the bubble is anchored against a specific extension
-    // icon, allowing the bubble to show a different message than when it is
-    // anchored against something else (e.g. show "This extension has..."
-    // instead of "An extension has...").
-    virtual base::string16 GetMessageBody(
-        bool anchored_to_browser_action) const = 0;
+    virtual base::string16 GetMessageBody() const = 0;
     virtual base::string16 GetOverflowText(
         const base::string16& overflow_count) const = 0;
     virtual base::string16 GetLearnMoreLabel() const = 0;