Add user_gesture param to BaseWindow::Activate

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 703 matching lines @@
 
 void BrowserView::SetBounds(const gfx::Rect& bounds) {
   ExitFullscreen();
   GetWidget()->SetBounds(bounds);
 }
 
 void BrowserView::Close() {
   frame_->Close();
 }
 
-void BrowserView::Activate() {
+void BrowserView::Activate(bool user_gesture) {
+  // TODO(johnme): Pass user_gesture to Activate.
   frame_->Activate();
 }
 
 void BrowserView::Deactivate() {
   frame_->Deactivate();
 }
 
 bool BrowserView::IsActive() const {
   return frame_->IsActive();
 }
@@ skipping 1813 matching lines @@
   // If another browser is app modal, flash and activate the modal browser.
   app_modal::AppModalDialog* active_dialog =
       app_modal::AppModalDialogQueue::GetInstance()->active_dialog();
   if (!active_dialog)
     return;
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
-    modal_browser->window()->Activate();
+    // TODO(johnme): Can we sometimes be certain this was for a user gesture?
+    modal_browser->window()->Activate(false /* user_gesture */);
   }
 
   app_modal::AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 int BrowserView::GetMaxTopInfoBarArrowHeight() {
   int top_arrow_height = 0;
   // Only show the arrows when not in fullscreen and when there's no omnibox
   // popup.
   if (!IsFullscreen() &&
@@ skipping 39 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }