#include "chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h"
-#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"
#include "chrome/browser/ui/sad_tab_helper.h"
#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
#include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h"
#include "chrome/browser/ui/views/sad_tab_view.h"
-#include "chrome/common/chrome_switches.h"
-#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "components/web_modal/popup_manager.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "ui/views/focus/view_storage.h"
#include "ui/views/widget/widget.h"
-using web_modal::WebContentsModalDialogManager;
-
ChromeWebContentsViewDelegateViews::ChromeWebContentsViewDelegateViews(
content::WebContents* web_contents)
: ContextMenuDelegate(web_contents),
}
}
- WebContentsModalDialogManager* web_contents_modal_dialog_manager =
- WebContentsModalDialogManager::FromWebContents(web_contents_);
- if (web_contents_modal_dialog_manager) {
- // TODO(erg): WebContents used to own web contents modal dialogs, which is
- // why this is here. Eventually this should be ported to a containing view
- // specializing in web contents modal dialog management.
- if (web_contents_modal_dialog_manager->IsDialogActive()) {
- web_contents_modal_dialog_manager->FocusTopmostDialog();
- return true;
- }
- }
+ web_modal::PopupManager* popup_manager =
+ web_modal::PopupManager::FromWebContents(web_contents_);
+ if (popup_manager)
+ popup_manager->WasFocused(web_contents_);
return false;
}