diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 12:51:43 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 12:51:43 +0000 |
commit | 932455407a6870e79bdf04615121b6a9a1766f01 (patch) | |
tree | dbd17fc73d7e99c620690f7324fdb5c5905d5e67 /chrome/browser/ui/gtk/zoom_bubble_gtk.cc | |
parent | db43338a7e82ebf6dfcc9555d794a5990a426781 (diff) | |
download | chromium_src-932455407a6870e79bdf04615121b6a9a1766f01.zip chromium_src-932455407a6870e79bdf04615121b6a9a1766f01.tar.gz chromium_src-932455407a6870e79bdf04615121b6a9a1766f01.tar.bz2 |
[test fixlet] Add tests for ZoomBubbleGTK.
TEST=ZoomBubbleGtkTest.* pass on bots.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11032028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/zoom_bubble_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/zoom_bubble_gtk.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc index 89bdbf5..a83338e 100644 --- a/chrome/browser/ui/gtk/zoom_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/zoom_bubble_gtk.cc @@ -20,9 +20,6 @@ namespace { -// Pointer to singleton object (NULL if no bubble is open). -ZoomBubbleGtk* g_bubble = NULL; - // Number of milliseconds the bubble should stay open for if it will auto-close. const int kBubbleCloseDelay = 1500; @@ -34,6 +31,9 @@ const int kBubbleAnchorHeight = 25; } // namespace // static +ZoomBubbleGtk* ZoomBubbleGtk::g_bubble = NULL; + +// static void ZoomBubbleGtk::Show(GtkWidget* anchor, TabContents* tab_contents, bool auto_close) { @@ -61,6 +61,11 @@ void ZoomBubbleGtk::Close() { g_bubble->CloseBubble(); } +// static +bool ZoomBubbleGtk::IsShowing() { + return g_bubble != NULL; +} + ZoomBubbleGtk::ZoomBubbleGtk(GtkWidget* anchor, TabContents* tab_contents, bool auto_close) @@ -158,7 +163,7 @@ void ZoomBubbleGtk::Refresh() { StartTimerIfNecessary(); } -void ZoomBubbleGtk::StartTimerIfNecessary() { +void ZoomBubbleGtk::StartTimerIfNecessaryInternal() { if (!auto_close_ || mouse_inside_) return; |