Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6102)

Unified Diff: chrome/browser/ui/views/extensions/extension_message_bubble_view.h

Issue 114153003: Add an extension bubble explaining which extensions are in dev mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/extensions/extension_message_bubble_view.h
diff --git a/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.h b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
similarity index 59%
copy from chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.h
copy to chrome/browser/ui/views/extensions/extension_message_bubble_view.h
index b247a012054a986462d2724bdad17d36da66ab99..4f07bb8f0894a9c03a2fed77a62e38e7c728cf67 100644
--- a/chrome/browser/ui/views/extensions/suspicious_extension_bubble_view.h
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
@@ -2,15 +2,17 @@
// 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_SUSPICIOUS_EXTENSION_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SUSPICIOUS_EXTENSION_BUBBLE_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_
-#include "chrome/browser/extensions/suspicious_extension_bubble.h"
+#include "chrome/browser/extensions/extension_message_bubble.h"
+#include "chrome/browser/extensions/extension_message_bubble_controller.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/link_listener.h"
class Browser;
+class ToolbarView;
namespace views {
class Label;
@@ -21,20 +23,20 @@ class Widget;
namespace extensions {
-class SuspiciousExtensionBubbleController;
-
// This is a class that implements the UI for the bubble showing which
// extensions look suspicious and have therefore been automatically disabled.
-class SuspiciousExtensionBubbleView : public SuspiciousExtensionBubble,
- public views::BubbleDelegateView,
- public views::ButtonListener,
- public views::LinkListener {
+class ExtensionMessageBubbleView : public ExtensionMessageBubble,
+ public views::BubbleDelegateView,
+ public views::ButtonListener,
+ public views::LinkListener {
public:
// Show the Disabled Extension bubble, if needed.
- static void MaybeShow(Browser* browser, views::View* anchor_view);
+ static void MaybeShow(
+ Browser* browser, ToolbarView* toolbar_view, views::View* anchor_view);
- // SuspiciousExtensionBubble methods.
- virtual void OnButtonClicked(const base::Closure& callback) OVERRIDE;
+ // ExtensionMessageBubble methods.
+ virtual void OnActionButtonClicked(const base::Closure& callback) OVERRIDE;
+ virtual void OnDismissButtonClicked(const base::Closure& callback) OVERRIDE;
virtual void OnLinkClicked(const base::Closure& callback) OVERRIDE;
virtual void Show() OVERRIDE;
@@ -42,10 +44,10 @@ class SuspiciousExtensionBubbleView : public SuspiciousExtensionBubble,
virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
private:
- SuspiciousExtensionBubbleView(
+ ExtensionMessageBubbleView(
views::View* anchor_view,
- SuspiciousExtensionBubbleController* controller);
- virtual ~SuspiciousExtensionBubbleView();
+ ExtensionMessageBubbleController::Delegate* delegate);
+ virtual ~ExtensionMessageBubbleView();
// Shows the bubble and updates the counter for how often it has been shown.
void ShowBubble();
@@ -65,27 +67,30 @@ class SuspiciousExtensionBubbleView : public SuspiciousExtensionBubble,
virtual void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) OVERRIDE;
- base::WeakPtrFactory<SuspiciousExtensionBubbleView> weak_factory_;
+ base::WeakPtrFactory<ExtensionMessageBubbleView> weak_factory_;
// The controller for the bubble. Weak, not owned by us.
- SuspiciousExtensionBubbleController* controller_;
+ ExtensionMessageBubbleController::Delegate* delegate_;
// 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 button_callback_;
+ base::Closure action_callback_;
+ base::Closure dismiss_callback_;
base::Closure link_callback_;
- DISALLOW_COPY_AND_ASSIGN(SuspiciousExtensionBubbleView);
+ DISALLOW_COPY_AND_ASSIGN(ExtensionMessageBubbleView);
};
} // namespace extensions
-#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SUSPICIOUS_EXTENSION_BUBBLE_VIEW_H_
+#endif // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_MESSAGE_BUBBLE_VIEW_H_

Powered by Google App Engine
This is Rietveld 408576698