Bug 4688: First run bubble ignores user's keyboard attempt...

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"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/event.h"
 #include "chrome/views/controls/button/native_button.h"
 #include "chrome/views/controls/label.h"
+#include "chrome/views/focus/focus_manager.h"
 #include "chrome/views/window/window.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 namespace {
 
-// How much extra padding to put around our content over what
-// infobubble provides.
+// How much extra padding to put around our content over what the InfoBubble
+// provides.
 static const int kBubblePadding = 4;
 
 std::wstring GetDefaultSearchEngineName(Profile* profile) {
   if (!profile) {
     NOTREACHED();
     return std::wstring();
   }
   const TemplateURL* const default_provider =
       profile->GetTemplateURLModel()->GetDefaultSearchProvider();
   if (!default_provider) {
     // TODO(cpu): bug 1187517. It is possible to have no default provider.
     // returning an empty string is a stopgap measure for the crash
     // http://code.google.com/p/chromium/issues/detail?id=2573
     return std::wstring();
   }
   return default_provider->short_name();
 }
 
 }  // namespace
 
 // Implements the client view inside the first run bubble. It is kind of a
 // dialog-ish view, but is not a true dialog.
 class FirstRunBubbleView : public views::View,
-                           public views::NativeButton::Listener {
+                           public views::NativeButton::Listener,
+                           public views::FocusChangeListener {
  public:
   FirstRunBubbleView(FirstRunBubble* bubble_window, Profile* profile)
       : bubble_window_(bubble_window),
         label1_(NULL),
         label2_(NULL),
         label3_(NULL),
         keep_button_(NULL),
         change_button_(NULL) {
     ChromeFont& font =
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);
@@ skipping 94 matching lines @@
       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) {
+      views::NativeButton* before =
+          static_cast<views::NativeButton*>(focused_before);
+      before->SetDefaultButton(false);
+    }
+    if (focused_now && focused_now->GetClassName() ==
+                       views::NativeButton::kViewClassName) {
+      views::NativeButton* after =
+          static_cast<views::NativeButton*>(focused_now);
+      after->SetDefaultButton(true);
+    }
+  }
+
  private:
   FirstRunBubble* bubble_window_;
   views::Label* label1_;
   views::Label* label2_;
   views::Label* label3_;
   views::NativeButton* change_button_;
   views::NativeButton* keep_button_;
-  DISALLOW_EVIL_CONSTRUCTORS(FirstRunBubbleView);
+
+  DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleView);
 };
 
 // Keep the bubble around for kLingerTime milliseconds, to prevent accidental
 // closure.
 static const int kLingerTime = 1000;
 
 void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
   // We might get re-enabled right before we are closed (sequence is: we get
   // deactivated, we call close, before we are actually closed we get
   // reactivated). Don't do the disabling of the parent in such cases.
@@ skipping 11 matching lines @@
   }
   InfoBubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
   enable_window_method_factory_.RevokeAll();
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManager(GetNativeView());
+  focus_manager->RemoveFocusChangeListener(view_);
 }
 
+// static
 FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd,
                                      const gfx::Rect& position_relative_to) {
   FirstRunBubble* window = new FirstRunBubble();
-  views::View* view = new FirstRunBubbleView(window, profile);
+  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);
   return window;
 }
 
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
 }