Revert 102263 - Revert 102216 - Fix activation problem when showing bubble view

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 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/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 834 matching lines @@
   TabContents* selected_tab_contents = GetSelectedTabContents();
   if (selected_tab_contents)
     selected_tab_contents->view()->RestoreFocus();
 }
 
 LocationBar* BrowserView::GetLocationBar() const {
   return GetLocationBarView();
 }
 
 void BrowserView::SetFocusToLocationBar(bool select_all) {
+  // Only change focus if this is the active window otherwise we'll end
+  // accidentally deactivating another window.
+  if (!IsActive())
+    return;
+
   if (UseCompactNavigationBar()) {
     // If focus ever goes to the location bar, we should make sure it is shown
     // in compact mode. This includes all accelerators that move focus there.
     ShowCompactLocationBarUnderSelectedTab();
   }
   LocationBarView* location_bar = GetLocationBarView();
   if (location_bar->IsFocusableInRootView()) {
     // Location bar got focus.
     location_bar->FocusLocation(select_all);
   } else {
@@ skipping 1843 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif