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

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

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
   // Shows the suspicious extensions bubble, if there are suspicious extensions
   // and we have not done so already.
   // Returns true if we have show the view.
   bool MaybeShowSuspiciousExtensionsBubble(views::View* anchor_view);
 
   // Shows the settings API extensions bubble, if there are extensions
   // overriding the startup pages and we have not done so already.
   // 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).
   bool MaybeShowDevModeExtensionsBubble(views::View* anchor_view);
 
   // Starts or stops observing the BrowserActionsContainer, if necessary.
   void MaybeObserve();
   void MaybeStopObserving();
 
   // Adds |profile| to the list of profiles that have been evaluated for showing
   // a bubble. Handy for things that only want to check once per profile.
   void RecordProfileCheck(Profile* profile);
   // Returns false if this profile has been evaluated before.
   bool IsInitialProfileCheck(Profile* profile);
 
   // BrowserActionsContainer::Observer implementation.
   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 HighlightDevModeExtensions();
 
-  // Inform the ExtensionToolbarModel to highlight the appropriate extensions.
-  void HighlightExtensions();
-
-  // 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();
 
   // The associated profile.
   Profile* profile_;
 
   // The toolbar view that the ExtensionMessageBubbleViews will attach to.
   ToolbarView* toolbar_view_;
 
   // Whether or not we have shown the suspicious extensions bubble.
   bool shown_suspicious_extensions_bubble_;
 
   // Whether or not we have shown the Settings API extensions bubble notifying
   // 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_;
 
   // Whether or not we are already observing the BrowserActionsContainer (so
   // we don't add ourselves twice).
   bool is_observing_;
 
   // The current stage of showing the bubble.
   Stage stage_;
 
   // The BrowserActionsContainer for the profile. This will be NULL if the
   // factory is not currently in the process of showing a bubble.
   BrowserActionsContainer* container_;
 
   // The default view to anchor the bubble to. This will be NULL if the factory
   // 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);
 };
 
 // This is a class that implements the UI for the bubble showing which
 // extensions look suspicious and have therefore been automatically disabled.
 class ExtensionMessageBubbleView : public ExtensionMessageBubble,
                                    public views::BubbleDelegateView,
                                    public views::ButtonListener,
                                    public views::LinkListener {
@@ skipping 30 matching lines @@
   // views::View implementation.
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void ViewHierarchyChanged(const ViewHierarchyChangedDetails& details)
       OVERRIDE;
 
   base::WeakPtrFactory<ExtensionMessageBubbleView> weak_factory_;
 
   // 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_;
   views::LabelButton* action_button_;
   views::LabelButton* dismiss_button_;
 
   // All actions (link, button, esc) close the bubble, but we need to
   // make sure we don't send dismiss if the link was clicked.
   bool link_clicked_;
   bool action_taken_;
 
   // Callbacks into the controller.
   base::Closure action_callback_;
   base::Closure dismiss_callback_;
   base::Closure link_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleView);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_