Merge 32335...

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2009 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/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
@@ skipping 420 matching lines @@
 
 void BrowserActionsContainer::BubbleBrowserWindowMoved(BrowserBubble* bubble) {
 }
 
 void BrowserActionsContainer::BubbleBrowserWindowClosing(
     BrowserBubble* bubble) {
   HidePopup();
 }
 
 void BrowserActionsContainer::BubbleGotFocus(BrowserBubble* bubble) {
+  if (!popup_)
+    return;
+
+  // Forward the focus to the renderer.
+  popup_->host()->render_view_host()->view()->Focus();
 }
 
 void BrowserActionsContainer::BubbleLostFocus(BrowserBubble* bubble) {
   if (!popup_)
     return;
 
   // This is a bit annoying.  If you click on the button that generated the
   // current popup, then we first get this lost focus message, and then
   // we get the click action.  This results in the popup being immediately
   // shown again.  To workaround this, we put in a delay.
@@ skipping 10 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kButtonSize +
                   kHorizontalPadding * 2);
 }