1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 6f06973..31c4432 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -99,6 +99,10 @@ class FirstRunBubbleView : public views::View,
     AddChildView(change_button_);
   }
 
+  void BubbleShown() {
+    keep_button_->RequestFocus();
+  }
+
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender) {
     bubble_window_->Close();
@@ -153,11 +157,6 @@ class FirstRunBubbleView : public views::View,
                             pref_size.width(), pref_size.height());
   }
 
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child) {
-    if (keep_button_)
-      keep_button_->RequestFocus();
-  }
-
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() {
     return gfx::Size(views::Window::GetLocalizedContentsSize(
@@ -237,6 +236,7 @@ FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd,
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(window->GetNativeView());
   focus_manager->AddFocusChangeListener(view);
+  view->BubbleShown();
   return window;
 }