Rename BrowserBubbleGtk/Win::Show to ShowAndActivate.

This makes it clear that it's not an override of WidgetGtk::Show

No intended functionality change.

BUG=70465,72205
TEST=none

Review URL: http://codereview.chromium.org/6635031

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

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc
index 8932731..a18f4ef 100644
--- a/chrome/browser/ui/views/browser_bubble_gtk.cc
+++ b/chrome/browser/ui/views/browser_bubble_gtk.cc
@@ -26,7 +26,7 @@ class BubbleWidget : public views::WidgetGtk {
         bubble_(bubble) {
   }
 
-  void Show(bool activate) {
+  void ShowAndActivate(bool activate) {
     // TODO: honor activate.
     views::WidgetGtk::Show();
   }
@@ -112,7 +112,7 @@ void BrowserBubble::MovePopup(int x, int y, int w, int h) {
 void BrowserBubble::Show(bool activate) {
   if (visible_)
     return;
-  static_cast<BubbleWidget*>(popup_)->Show(activate);
+  static_cast<BubbleWidget*>(popup_)->ShowAndActivate(activate);
   visible_ = true;
 }
 
diff --git a/chrome/browser/ui/views/browser_bubble_win.cc b/chrome/browser/ui/views/browser_bubble_win.cc
index 4d75cdf..1753db6 100644
--- a/chrome/browser/ui/views/browser_bubble_win.cc
+++ b/chrome/browser/ui/views/browser_bubble_win.cc
@@ -17,7 +17,7 @@ class BubbleWidget : public views::WidgetWin {
     set_window_ex_style(WS_EX_TOOLWINDOW);
   }
 
-  void Show(bool activate) {
+  void ShowAndActivate(bool activate) {
     if (activate)
       ShowWindow(SW_SHOW);
     else
@@ -115,7 +115,7 @@ void BrowserBubble::Show(bool activate) {
   if (visible_)
     return;
   BubbleWidget* pop = static_cast<BubbleWidget*>(popup_);
-  pop->Show(activate);
+  pop->ShowAndActivate(activate);
   visible_ = true;
 }