Add an extension override bubble and warning box for proxy extensions.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6c0994ce82cb12629fccb861f7c5c0d0c081c248..47dc0c7f8bad29f739ee903f1db02b80aa916913 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5151,6 +5151,16 @@ 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

[Devlin, 2014/05/20 17:26:31]

I assume "Internet" should not be capitalized - unless that's a UI decision?

[Finnur, 2014/05/21 16:30:32]

If you search the grd file, you'll see we're not totally consistent on the
capitalization, not even in the same sentence.

You'll find a fair bit more cases where it is capitalized, though.

+        </message>
+      </if>
 
       <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.
@@ -5173,6 +5183,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
         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 in the Settings API bubble as first line when an extension has changed the proxy.">

[Devlin, 2014/05/20 17:26:31]

s/in the Settings API bubble as first line/as the first line in the Settings*
API bubble

This isn't the Settings API bubble, though, right?  Or are we lumping them
together?

[Finnur, 2014/05/21 16:30:32]

Copy paste error. Good catch.

+        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.

[Devlin, 2014/05/20 17:26:31]

nit: break, or eavesdrop

You'll get different answers on this, so feel free to ignore it.  But I prefer
", and" for all kinds of reasons.  (Classic example: if a last will leaves an
inheritance to 'Joe, Fred, and Bob' they all get 1/3 - if it's to 'Joe, Fred and
Bob', then Joe gets half and Fred and Bob split the other half.)

[Finnur, 2014/05/21 16:30:32]

I agree. Got this text from the PM and I don't think this was intentional.
Fixed.

+      </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>
@@ -9554,6 +9568,9 @@ 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>
@@ -9853,9 +9870,6 @@ Chrome ran out of memory.
             <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is using your computer's system proxy settings to connect to the network.
           </message>
         </if>
-        <message name="IDS_OPTIONS_EXTENSION_PROXIES_LABEL" desc="The info label for the 'Proxy settings' button when managed by an extension.">
-          Your network proxy settings are being managed by an extension.
-        </message>
 
         <message name="IDS_GOOGLE_CLOUD_PRINT" desc="The name of the Google Cloud Print product.">
           Google Cloud Print