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

Unified Diff: chrome/browser/ui/views/global_error_bubble_view.h

Issue 8570014: global error bubble view move to views/bubble api. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/global_error_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/global_error_bubble_view.h
diff --git a/chrome/browser/ui/views/global_error_bubble_view.h b/chrome/browser/ui/views/global_error_bubble_view.h
index 6c0079e4df9a7bbcf3ae1298bd6959f7872a5420..a9b143dc9e5924db95b0a2df66c7f69e34707464 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.h
+++ b/chrome/browser/ui/views/global_error_bubble_view.h
@@ -6,44 +6,36 @@
#define CHROME_BROWSER_UI_VIEWS_GLOBAL_ERROR_BUBBLE_VIEW_H_
#pragma once
-#include "chrome/browser/ui/views/bubble/bubble.h"
+#include "views/bubble/bubble_delegate.h"
#include "views/controls/button/button.h"
class Browser;
class GlobalError;
-namespace views {
-class Label;
-}
-
-class GlobalErrorBubbleView : public views::View,
- public views::ButtonListener,
- public BubbleDelegate {
+class GlobalErrorBubbleView : public views::ButtonListener,
+ public views::BubbleDelegateView {
public:
- GlobalErrorBubbleView(Browser* browser, GlobalError* error);
+ GlobalErrorBubbleView(views::View* anchor_view,
+ views::BubbleBorder::ArrowLocation location,
+ const SkColor& color,
+ Browser* browser,
+ GlobalError* error);
virtual ~GlobalErrorBubbleView();
- // views::View implementation.
- virtual gfx::Size GetPreferredSize() OVERRIDE;
+ // views::BubbleDelegateView implementation.
+ virtual gfx::Point GetAnchorPoint() OVERRIDE;
// views::ButtonListener implementation.
virtual void ButtonPressed(views::Button* sender,
const views::Event& event) OVERRIDE;
- // BubbleDelegate implementation.
- virtual void BubbleClosing(Bubble* bubble, bool closed_by_escape) OVERRIDE;
- virtual bool CloseOnEscape() OVERRIDE;
- virtual bool FadeInOnShow() OVERRIDE;
-
- void set_bubble(Bubble* bubble) { bubble_ = bubble; }
+ // views::WidgetDelegate implementation.
+ virtual void WindowClosing() OVERRIDE;
private:
Browser* browser_;
GlobalError* error_;
- views::Label* message_label_;
- Bubble* bubble_;
-
DISALLOW_COPY_AND_ASSIGN(GlobalErrorBubbleView);
};
« no previous file with comments | « no previous file | chrome/browser/ui/views/global_error_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698