Fix --kiosk to work regardless of the startup pref setting or supplied URLs. ...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 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/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 657 matching lines @@
   // We really "should" restore the focus whenever the window becomes unhidden,
   // but I think initializing is the only time where this can happen where
   // there is some focus change we need to pick up, and this is easier than
   // plumbing through an un-hide message all the way from the frame.
   //
   // If we do find there are cases where we need to restore the focus on show,
   // that should be added and this should be removed.
   RestoreFocus();
 
   frame_->GetWindow()->Show();
+
+  // The following block also appears in BrowserWindowGtk::Show().
+#if !defined(OS_WIN)
+  // The Browser associated with this browser window must become the active
+  // browser at the time Show() is called. This is the natural behavior under
+  // Windows, but gtk_widget_show won't show the widget (and therefore won't
+  // call OnFocusIn()) until we return to the runloop. Therefore any calls to
+  // BrowserList::GetLastActive() (for example, in bookmark_util), will return
+  // the previous browser instead if we don't explicitly set it here.
+  BrowserList::SetLastActive(browser());
+#endif
 }
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
   BrowserBubbleHost::Close();
 
   frame_->GetWindow()->Close();
@@ skipping 1551 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }