Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

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 1484 matching lines @@
 
 bool BrowserView::CanMaximize() const {
   return true;
 }
 
 bool BrowserView::CanMinimize() const {
   return true;
 }
 
 bool BrowserView::CanActivate() const {
-  if (!AppModalDialogQueue::GetInstance()->active_dialog() ||
-      !AppModalDialogQueue::GetInstance()->active_dialog()->native_dialog())
+  app_modal_dialogs::AppModalDialogQueue* queue =
+      app_modal_dialogs::AppModalDialogQueue::GetInstance();
+  if (!queue->active_dialog() || !queue->active_dialog()->native_dialog())
     return true;
 
 #if defined(USE_AURA) && defined(OS_CHROMEOS)
   // On Aura window manager controls all windows so settings focus via PostTask
   // will make only worse because posted task will keep trying to steal focus.
-  AppModalDialogQueue::GetInstance()->ActivateModalDialog();
+  app_modal_dialogs::AppModalDialogQueue::GetInstance()->ActivateModalDialog();

[msw, 2014/11/15 00:51:56]

nit: use |queue| here.

[oshima, 2014/11/18 17:42:41]

Done.

 #else
   // If another browser is app modal, flash and activate the modal browser. This
   // has to be done in a post task, otherwise if the user clicked on a window
   // that doesn't have the modal dialog the windows keep trying to get the focus
   // from each other on Windows. http://crbug.com/141650.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&BrowserView::ActivateAppModalDialog,
                  activate_modal_dialog_factory_.GetWeakPtr()));
 #endif
@@ skipping 961 matching lines @@
   if (native_view->HasFocus()) {
     (contents->*method)();
     return true;
   }
 
   return false;
 }
 
 void BrowserView::ActivateAppModalDialog() const {
   // If another browser is app modal, flash and activate the modal browser.
-  AppModalDialog* active_dialog =
-      AppModalDialogQueue::GetInstance()->active_dialog();
+  app_modal_dialogs::AppModalDialog* active_dialog =
+      app_modal_dialogs::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();
   }
 
-  AppModalDialogQueue::GetInstance()->ActivateModalDialog();
+  app_modal_dialogs::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() &&
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(nullptr));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }