Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h

Issue 666533007: Move JavaScriptDialogManager, JavascriptAppModalDialogViews to components/app_modal_dialogs (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h
diff --git a/chrome/browser/ui/views/javascript_app_modal_dialog_views.h b/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h
similarity index 77%
rename from chrome/browser/ui/views/javascript_app_modal_dialog_views.h
rename to components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h
index 531bc543f45226fc4c70bb9b31e8fec0051d1637..456e55c26d3b47633388adaae7aea66bd350e3c5 100644
--- a/chrome/browser/ui/views/javascript_app_modal_dialog_views.h
+++ b/components/app_modal_dialogs/views/javascript_app_modal_dialog_views.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#ifndef COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#define COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
#include "base/memory/scoped_ptr.h"
#include "components/app_modal_dialogs/native_app_modal_dialog.h"
@@ -11,10 +11,6 @@
class JavaScriptAppModalDialog;
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-class JavascriptAppModalEventBlockerX11;
-#endif
-
namespace views {
class MessageBoxView;
}
@@ -37,7 +33,6 @@ class JavaScriptAppModalDialogViews : public NativeAppModalDialog,
int GetDefaultDialogButton() const override;
int GetDialogButtons() const override;
base::string16 GetWindowTitle() const override;
- void WindowClosing() override;
void DeleteDelegate() override;
bool Cancel() override;
bool Accept() override;
@@ -58,12 +53,7 @@ class JavaScriptAppModalDialogViews : public NativeAppModalDialog,
// The message box view whose commands we handle.
views::MessageBoxView* message_box_view_;
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
- // Blocks events to other browser windows while the dialog is open.
- scoped_ptr<JavascriptAppModalEventBlockerX11> event_blocker_x11_;
-#endif
-
DISALLOW_COPY_AND_ASSIGN(JavaScriptAppModalDialogViews);
};
-#endif // CHROME_BROWSER_UI_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_
+#endif // COMPONENTS_APP_MODAL_DIALOGS_VIEWS_JAVASCRIPT_APP_MODAL_DIALOG_VIEWS_H_

Powered by Google App Engine
This is Rietveld 408576698