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

trunk/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.h

Index: trunk/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
===================================================================
--- trunk/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.h	(revision 275254)
+++ trunk/src/chrome/browser/ui/views/extensions/extension_message_bubble_view.h	(working copy)
@@ -60,11 +60,6 @@
   // Returns true if we show the view (or start the process).
   bool MaybeShowStartupOverrideExtensionsBubble(views::View* anchor_view);
 
-  // Shows the bubble for when there are extensions overriding the proxy (if we
-  // have not done so already). Returns true if we show the view (or start the
-  // process of doing so).
-  bool MaybeShowProxyOverrideExtensionsBubble(views::View* anchor_view);
-
   // Shows the developer mode extensions bubble, if there are extensions running
   // in developer mode and we have not done so already.
   // Returns true if we show the view (or start the process).
@@ -84,17 +79,11 @@
   virtual void OnBrowserActionsContainerAnimationEnded() OVERRIDE;
   virtual void OnBrowserActionsContainerDestroyed() OVERRIDE;
 
-  // Sets the stage for highlighting extensions and then showing the bubble
-  // controlled by |controller|, anchored to |anchor_view|.
-  void PrepareToHighlightExtensions(
-      scoped_ptr<ExtensionMessageBubbleController> controller,
-      views::View* anchor_view);
-
   // Inform the ExtensionToolbarModel to highlight the appropriate extensions.
-  void HighlightExtensions();
+  void HighlightDevModeExtensions();
 
-  // Shows the waiting bubbble, after highlighting the extensions.
-  void ShowHighlightingBubble();
+  // Shows the developer mode bubble, after highlighting the extensions.
+  void ShowDevModeBubble();
 
   // Finishes the process of showing the developer mode bubble.
   void Finish();
@@ -112,10 +101,6 @@
   // the user about the startup pages being overridden.
   bool shown_startup_override_extensions_bubble_;
 
-  // Whether or not we have shown the bubble notifying the user about the proxy
-  // being overridden.
-  bool shown_proxy_override_extensions_bubble_;
-
   // Whether or not we have shown the developer mode extensions bubble.
   bool shown_dev_mode_extensions_bubble_;
 
@@ -134,9 +119,9 @@
   // is not currently in the process of showing a bubble.
   views::View* anchor_view_;
 
-  // The controller to show a bubble for. This will be NULL if the factory is
-  // not currently in the process of showing a bubble.
-  scoped_ptr<ExtensionMessageBubbleController> controller_;
+  // The DevModeBubbleController to use. This will be NULL if the factory is not
+  // currently in the process of showing a bubble.
+  scoped_ptr<DevModeBubbleController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleFactory);
 };
@@ -187,9 +172,6 @@
   // The controller for this bubble.
   scoped_ptr<ExtensionMessageBubbleController> controller_;
 
-  // The view this bubble is anchored against.
-  views::View* anchor_view_;
-
   // The headline, labels and buttons on the bubble.
   views::Label* headline_;
   views::Link* learn_more_;