| Index: chrome/browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc b/chrome/browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc
|
| index 6d6dc6cab265c560051ce937999c32909cbccc21..71f687cf78b9b77e6477b1fc55069ff943b441e0 100644
|
| --- a/chrome/browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/web_contents_modal_dialog_manager_gtk.cc
|
| @@ -4,13 +4,13 @@
|
|
|
| #include "chrome/browser/ui/gtk/gtk_util.h"
|
| #include "chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h"
|
| -#include "components/web_modal/native_web_contents_modal_dialog_manager.h"
|
| +#include "components/web_modal/single_web_contents_dialog_manager.h"
|
| #include "components/web_modal/web_contents_modal_dialog_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "ui/base/gtk/focus_store_gtk.h"
|
|
|
| using web_modal::NativeWebContentsModalDialog;
|
| -using web_modal::NativeWebContentsModalDialogManagerDelegate;
|
| +using web_modal::SingleWebContentsDialogManagerDelegate;
|
|
|
| namespace {
|
|
|
| @@ -18,10 +18,10 @@ namespace {
|
| // Win32 system, ConstrainedWindowGtk doesn't draw draggable fake windows and
|
| // instead just centers the dialog. It is thus an order of magnitude simpler.
|
| class NativeWebContentsModalDialogManagerGtk
|
| - : public web_modal::NativeWebContentsModalDialogManager {
|
| + : public web_modal::SingleWebContentsDialogManager {
|
| public:
|
| NativeWebContentsModalDialogManagerGtk(
|
| - NativeWebContentsModalDialogManagerDelegate* native_delegate)
|
| + SingleWebContentsDialogManagerDelegate* native_delegate)
|
| : native_delegate_(native_delegate),
|
| shown_widget_(NULL) {
|
| }
|
| @@ -29,7 +29,7 @@ class NativeWebContentsModalDialogManagerGtk
|
| virtual ~NativeWebContentsModalDialogManagerGtk() {
|
| }
|
|
|
| - // NativeWebContentsModalDialogManager overrides
|
| + // SingleWebContentsDialogManager overrides
|
| virtual void ManageDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
|
| DCHECK(g_object_is_floating(GetGtkWidget(dialog)));
|
| g_object_ref_sink(GetGtkWidget(dialog));
|
| @@ -151,9 +151,9 @@ void NativeWebContentsModalDialogManagerGtk::OnDestroy(
|
|
|
| namespace web_modal {
|
|
|
| -NativeWebContentsModalDialogManager*
|
| - WebContentsModalDialogManager::CreateNativeManager(
|
| - NativeWebContentsModalDialogManagerDelegate* native_delegate) {
|
| +SingleWebContentsDialogManager*
|
| + WebContentsModalDialogManager::CreateNativeWebModalManager(
|
| + SingleWebContentsDialogManagerDelegate* native_delegate) {
|
| return new NativeWebContentsModalDialogManagerGtk(native_delegate);
|
| }
|
|
|
|
|