Linux/Mac Views: Make BrowserWindow::Show() behave like Windows.

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

 // Copyright 2012 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"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 641 matching lines @@
 
 gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const {
   return *GetThemeProvider()->GetImageSkiaNamed(IDR_OTR_ICON);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
 void BrowserView::Show() {
   // If the window is already visible, just activate it.
   if (frame_->IsVisible()) {

[tapted, 2015/03/30 23:01:04]

just noticed this early exit condition.. it's probably not relevant for kiosk
mode, but it might explain why error bubbles provided by
GlobalErrorServiceFactory sometimes get lost on session restore..

     frame_->Activate();
     return;
   }
 
   // Showing the window doesn't make the browser window active right away.
   // This can cause SetFocusToLocationBar() to skip setting focus to the
   // location bar. To avoid this we explicilty let SetFocusToLocationBar()
   // know that it's ok to steal focus.
   force_location_bar_focus_ = true;
 
   // Setting the focus doesn't work when the window is invisible, so any focus
   // initialization that happened before this will be lost.
   //
   // 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_->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 and Ash, but other platforms will not trigger
+  // OnWidgetActivationChanged() until we return to the runloop. Therefore any
+  // calls to Browser::GetLastActive() will return the wrong result if we do not
+  // explicitly set it here.
+  // A similar block also appears in BrowserWindowCocoa::Show().
+  if (browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+    BrowserList::SetLastActive(browser());
+#endif
+
   force_location_bar_focus_ = false;
 
   browser()->OnWindowDidShow();
 
   chrome::MaybeShowInvertBubbleView(this);
 }
 
 void BrowserView::ShowInactive() {
   if (!frame_->IsVisible())
     frame_->ShowInactive();
@@ skipping 1916 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }