Remove BubbleDelegateView::Show(); call GetWidget()->Show() instead; etc.

Removes the redundant/unnecessary helper function.
Call Show() on GetWidget() or CreateBubble's returned Widget.

BUG=none
TEST=Bubbles show fine.
R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/12897004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188557 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 7 insertions, 16 deletions

diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 21ccd1e..4f372c4 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -237,10 +237,6 @@ gfx::Rect BubbleDelegateView::GetAnchorRect() {
   return anchor_bounds;
 }
 
-void BubbleDelegateView::Show() {
-  GetWidget()->Show();
-}
-
 void BubbleDelegateView::StartFade(bool fade_in) {
   fade_animation_.reset(new ui::SlideAnimation(this));
   fade_animation_->SetSlideDuration(kHideFadeDurationMS);
@@ -250,7 +246,7 @@ void BubbleDelegateView::StartFade(bool fade_in) {
     if (border_widget_)
       border_widget_->SetOpacity(original_opacity_);
     GetWidget()->SetOpacity(original_opacity_);
-    Show();
+    GetWidget()->Show();
     fade_animation_->Show();
   } else {
     original_opacity_ = 255;
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index 080bdcb..de69c5c 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -108,9 +108,6 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
   // Get the arrow's anchor rect in screen space.
   virtual gfx::Rect GetAnchorRect();
 
-  // Show the bubble's widget (and |border_widget_| on Windows).
-  void Show();
-
   // Fade the bubble in or out via Widget transparency.
   // Fade in calls Widget::Show; fade out calls Widget::Close upon completion.
   void StartFade(bool fade_in);
diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
index b90615a..235a667 100644
--- a/ui/views/bubble/bubble_frame_view_unittest.cc
+++ b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -95,7 +95,7 @@ TEST_F(BubbleFrameViewTest, NonClientHitTest) {
   BubbleDelegateView* delegate =
       new SizedBubbleDelegateView(anchor_widget->GetContentsView());
   Widget* widget(BubbleDelegateView::CreateBubble(delegate));
-  delegate->Show();
+  widget->Show();
   gfx::Point kPtInBound(100, 100);
   gfx::Point kPtOutsideBound(1000, 1000);
   BubbleFrameView* bubble_frame_view = delegate->GetBubbleFrameView();
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index 88bdeea..1fffdc0 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -295,7 +295,7 @@ void TrayBubbleView::InitializeAndShowBubble() {
   if (get_use_acceleration_when_possible())
     layer()->parent()->SetMaskLayer(bubble_content_mask_->layer());
 
-  Show();
+  GetWidget()->Show();
   UpdateBubble();
 }
 
diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc
index 841d177..936bc3a 100644
--- a/ui/views/examples/bubble_example.cc
+++ b/ui/views/examples/bubble_example.cc
@@ -90,7 +90,7 @@ void BubbleExample::ButtonPressed(Button* sender, const ui::Event& event) {
   if (config.fade_in)
     bubble_delegate->StartFade(true);
   else
-    bubble_delegate->Show();
+    bubble_delegate->GetWidget()->Show();
 
   if (config.fade_out) {
     bubble_delegate->set_close_on_esc(false);
diff --git a/ui/views/touchui/touch_editing_menu.cc b/ui/views/touchui/touch_editing_menu.cc
index 6b87f25..aa332b7 100644
--- a/ui/views/touchui/touch_editing_menu.cc
+++ b/ui/views/touchui/touch_editing_menu.cc
@@ -77,7 +77,7 @@ TouchEditingMenuView::TouchEditingMenuView(
   CreateButtons();
   views::BubbleDelegateView::CreateBubble(this);
   GetBubbleFrameView()->set_background(NULL);
-  Show();
+  GetWidget()->Show();
 }
 
 TouchEditingMenuView::~TouchEditingMenuView() {
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 445c2af..0b2863c 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1196,16 +1196,14 @@ TEST_F(WidgetTest, FocusChangesOnBubble) {
   BubbleDelegateView* bubble_delegate_view =
       new BubbleDelegateView(contents_view, BubbleBorder::TOP_LEFT);
   bubble_delegate_view->set_focusable(true);
-  Widget* bubble_widget =
-      BubbleDelegateView::CreateBubble(bubble_delegate_view);
-  bubble_delegate_view->Show();
+  BubbleDelegateView::CreateBubble(bubble_delegate_view)->Show();
   bubble_delegate_view->RequestFocus();
 
   // |contents_view_| should no longer have focus.
   EXPECT_FALSE(contents_view->HasFocus());
   EXPECT_TRUE(bubble_delegate_view->HasFocus());
 
-  bubble_widget->CloseNow();
+  bubble_delegate_view->GetWidget()->CloseNow();
 
   // Closing the bubble should result in focus going back to the contents view.
   EXPECT_TRUE(contents_view->HasFocus());