Fix X11DesktopHandler::ActivateWindow on Unity for known user gestures

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 646 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
 void BrowserView::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.
+  // explicitly set it here and in ShowForUserGesture().
   // A similar block also appears in BrowserWindowCocoa::Show().
   if (browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
     BrowserList::SetLastActive(browser());
 #endif
 
   // If the window is already visible, just activate it.
   if (frame_->IsVisible()) {
     frame_->Activate();
     return;
   }
@@ skipping 18 matching lines @@
 
   frame_->Show();
 
   force_location_bar_focus_ = false;
 
   browser()->OnWindowDidShow();
 
   chrome::MaybeShowInvertBubbleView(this);
 }
 
+void BrowserView::ShowForUserGesture() {
+  if (!frame_->IsVisible()) {
+    Show();
+    return;
+  }
+
+#if !defined(OS_WIN)
+  // See comment in Show().
+  if (browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+    BrowserList::SetLastActive(browser());
+#endif
+
+  // Since the window is already visible, just activate it.
+  frame_->ActivateForUserGesture();
+}
+
 void BrowserView::ShowInactive() {
   if (!frame_->IsVisible())
     frame_->ShowInactive();
 }
 
 void BrowserView::Hide() {
   // Not implemented.
 }
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
   ExitFullscreen();
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
   frame_->Close();
 }
 
 void BrowserView::Activate() {
   frame_->Activate();
 }
 
+void BrowserView::ActivateForUserGesture() {
+  frame_->ActivateForUserGesture();
+}
+
 void BrowserView::Deactivate() {
   frame_->Deactivate();
 }
 
 bool BrowserView::IsActive() const {
   return frame_->IsActive();
 }
 
 void BrowserView::FlashFrame(bool flash) {
   frame_->FlashFrame(flash);
@@ skipping 1870 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }