Fix for focus issue in first run bubble

chrome/browser/views/first_run_bubble.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/first_run_bubble.h"
 
 #include "base/win_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 81 matching lines @@
                               GetDefaultSearchEngineName(profile));
     keep_button_ = new views::NativeButton(this, keep_str);
     keep_button_->SetIsDefault(true);
     AddChildView(keep_button_);
 
     std::wstring change_str = l10n_util::GetString(IDS_FR_BUBBLE_CHANGE);
     change_button_ = new views::NativeButton(this, change_str);
     AddChildView(change_button_);
   }
 
+  void BubbleShown() {
+    keep_button_->RequestFocus();
+  }
+
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender) {
     bubble_window_->Close();
     if (change_button_ == sender) {
       Browser* browser = BrowserList::GetLastActive();
       if (browser) {
         ShowOptionsWindow(OPTIONS_PAGE_GENERAL, OPTIONS_GROUP_DEFAULT_SEARCH,
                           browser->profile());
       }
     }
@@ skipping 34 matching lines @@
         canvas.width() - pref_size.width() - kBubblePadding,
         canvas.height() - pref_size.height() - kButtonVEdgeMargin,
         pref_size.width(), pref_size.height());
 
     pref_size = keep_button_->GetPreferredSize();
     keep_button_->SetBounds(change_button_->x() - pref_size.width() -
                             kRelatedButtonHSpacing, change_button_->y(),
                             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(
         IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS,
         IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES));
   }
 
   virtual void FocusWillChange(View* focused_before, View* focused_now) {
     if (focused_before && focused_before->GetClassName() ==
                           views::NativeButton::kViewClassName) {
@@ skipping 59 matching lines @@
                                      const gfx::Rect& position_relative_to) {
   FirstRunBubble* window = new FirstRunBubble();
   FirstRunBubbleView* view = new FirstRunBubbleView(window, profile);
   window->SetDelegate(window);
   window->set_view(view);
   window->Init(parent_hwnd, position_relative_to, view);
   window->ShowWindow(SW_SHOW);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(window->GetNativeView());
   focus_manager->AddFocusChangeListener(view);
+  view->BubbleShown();
   return window;
 }
 
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
 }