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

Unified Diff: chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h

Issue 7549005: Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with (Closed) Base URL: /usr/local/google/chromium2/src@trunk
Patch Set: Created 9 years, 5 months 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/gtk/fullscreen_exit_bubble_gtk.h
diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
index 4a55ee094ec729eb8b0c25fc152821c939c796fa..de7333524a5ce0cc17bd75af5d97fb8210c66c2c 100644
--- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_GTK_FULLSCREEN_EXIT_BUBBLE_GTK_H_
#pragma once
-#include "base/timer.h"
+#include "chrome/browser/ui/fullscreen_exit_bubble.h"
#include "chrome/browser/ui/gtk/slide_animator_gtk.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/gtk_signal_registrar.h"
@@ -16,21 +16,29 @@ typedef struct _GtkWidget GtkWidget;
// FullscreenExitBubbleGTK is responsible for showing a bubble atop the screen
// in fullscreen mode, telling users how to exit and providing a click target.
-class FullscreenExitBubbleGtk {
+class FullscreenExitBubbleGtk : public FullscreenExitBubble {
public:
// We place the bubble in |container|.
- explicit FullscreenExitBubbleGtk(GtkFloatingContainer* container);
+ explicit FullscreenExitBubbleGtk(
tony 2011/08/02 17:04:25 Drop explicit since it doesn't do anything anymore
jeremya 2011/08/03 07:32:30 Done.
+ GtkFloatingContainer* container,
+ CommandUpdater::CommandUpdaterDelegate* delegate);
virtual ~FullscreenExitBubbleGtk();
+ protected:
tony 2011/08/02 17:04:25 Nit: I would make the interface methods protected
jeremya 2011/08/03 07:32:30 Done.
void InitWidgets();
- private:
GtkWidget* widget() const {
return slide_widget_->widget();
}
- // Hide the exit bubble.
- void Hide();
+ // FullScreenExitBubble
+ virtual gfx::Rect GetPopupRect(bool ignore_animation_state) const;
+ virtual gfx::Point GetCursorScreenPoint();
+ virtual bool WindowContainsPoint(gfx::Point pos);
+ virtual bool IsWindowActive();
+ virtual void Hide();
+ virtual void Show();
+ virtual bool IsAnimating();
tony 2011/08/02 17:04:25 Please add Override to these methods.
jeremya 2011/08/03 07:32:30 Done.
CHROMEGTK_CALLBACK_1(FullscreenExitBubbleGtk, void, OnSetFloatingPosition,
GtkAllocation*);
@@ -39,6 +47,9 @@ class FullscreenExitBubbleGtk {
// A pointer to the floating container that is our parent.
GtkFloatingContainer* container_;
+ // The widget that contains the link.
+ GtkWidget* link_container_;
+
// The widget that animates the slide-out of fullscreen exit bubble.
scoped_ptr<SlideAnimatorGtk> slide_widget_;

Powered by Google App Engine
This is Rietveld 408576698