| Index: chrome/browser/ui/views/fullscreen_exit_bubble_views.h
|
| diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
|
| index e1a8f63686425641eb1309ae7c79d7ce9a95575f..f9f314a35f71a866927f5468e16e7dbd3347864b 100644
|
| --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
|
| +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.h
|
| @@ -8,30 +8,29 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h"
|
| +#include "ui/gfx/rect.h"
|
|
|
| +class BrowserView;
|
| class GURL;
|
| +
|
| namespace ui {
|
| class SlideAnimation;
|
| }
|
| -namespace views {
|
| -class View;
|
| -class Widget;
|
| -}
|
|
|
| -// FullscreenExitBubbleViews is responsible for showing a bubble atop the
|
| -// screen in fullscreen mode, telling users how to exit and providing a click
|
| -// target. The bubble auto-hides, and re-shows when the user moves to the
|
| -// screen top.
|
| +// FullscreenExitBubbleViews is responsible for showing a bubble atop the screen
|
| +// in fullscreen mode, telling users how to exit and providing a click target.
|
| +// The bubble auto-hides, and re-shows when the user moves to the screen top.
|
| class FullscreenExitBubbleViews : public FullscreenExitBubble {
|
| public:
|
| - FullscreenExitBubbleViews(views::Widget* frame,
|
| - Browser* browser,
|
| + FullscreenExitBubbleViews(BrowserView* browser_view,
|
| const GURL& url,
|
| FullscreenExitBubbleType bubble_type);
|
| virtual ~FullscreenExitBubbleViews();
|
|
|
| void UpdateContent(const GURL& url, FullscreenExitBubbleType bubble_type);
|
|
|
| + const gfx::Rect& display_bounds() const { return display_; }
|
| +
|
| private:
|
| class FullscreenExitView;
|
|
|
| @@ -48,15 +47,16 @@ class FullscreenExitBubbleViews : public FullscreenExitBubble {
|
|
|
| void StartWatchingMouseIfNecessary();
|
|
|
| - // The root view containing us.
|
| - views::View* root_view_;
|
| + // The browser view containing us.
|
| + BrowserView* browser_view_;
|
|
|
| - views::Widget* popup_;
|
| + // The display bounds for the fullscreen window, in screen coordinates.
|
| + gfx::Rect display_;
|
|
|
| // Animation controlling sliding into/out of the top of the screen.
|
| - scoped_ptr<ui::SlideAnimation> size_animation_;
|
| + scoped_ptr<ui::SlideAnimation> animation_;
|
|
|
| - // The contents of the popup.
|
| + // The contents of the bubble.
|
| FullscreenExitView* view_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FullscreenExitBubbleViews);
|
|
|