summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 06:20:08 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 06:20:08 +0000
commit41c5a18eaf43bfb282dacc9c3a7a5d0ffa258982 (patch)
treeb3c7d3e1c2f06932537e4e98c95d46786490fbef
parentff6256104abc7e766684f28ef4c42b945fd3225e (diff)
downloadchromium_src-41c5a18eaf43bfb282dacc9c3a7a5d0ffa258982.zip
chromium_src-41c5a18eaf43bfb282dacc9c3a7a5d0ffa258982.tar.gz
chromium_src-41c5a18eaf43bfb282dacc9c3a7a5d0ffa258982.tar.bz2
Move WebDialogWebContentsDelegate to ui/web_dialogs.
Also move WebDialogWebContentsDelegate into ui namespace. BUG=124222,125841 TEST=None Review URL: https://chromiumcodereview.appspot.com/10796049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/browser/printing/print_preview_tab_controller.cc3
-rw-r--r--chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm5
-rw-r--r--chrome/browser/ui/cocoa/web_dialog_window_controller.mm3
-rw-r--r--chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc1
-rw-r--r--chrome/browser/ui/gtk/web_dialog_gtk.cc1
-rw-r--r--chrome/browser/ui/gtk/web_dialog_gtk.h4
-rw-r--r--chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc1
-rw-r--r--chrome/browser/ui/views/web_dialog_view.cc1
-rw-r--r--chrome/browser/ui/views/web_dialog_view.h4
-rw-r--r--chrome/browser/ui/webui/chrome_web_contents_handler.h4
-rw-r--r--chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc1
-rw-r--r--chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h4
-rw-r--r--chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc3
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--ui/web_dialogs/constrained_web_dialog_ui.h2
-rw-r--r--ui/web_dialogs/web_dialog_web_contents_delegate.cc (renamed from chrome/browser/ui/webui/web_dialog_web_contents_delegate.cc)6
-rw-r--r--ui/web_dialogs/web_dialog_web_contents_delegate.h (renamed from chrome/browser/ui/webui/web_dialog_web_contents_delegate.h)14
-rw-r--r--ui/web_dialogs/web_dialogs.gyp2
18 files changed, 40 insertions, 21 deletions
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index ba151c8..e200210 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -41,6 +40,7 @@
#include "content/public/browser/web_contents_delegate.h"
#include "ui/web_dialogs/constrained_web_dialog_ui.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
#include "webkit/plugins/webplugininfo.h"
using content::NativeWebKeyboardEvent;
@@ -49,6 +49,7 @@ using content::WebContents;
using content::WebUIMessageHandler;
using ui::ConstrainedWebDialogDelegate;
using ui::WebDialogDelegate;
+using ui::WebDialogWebContentsDelegate;
namespace {
diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
index 77a42a0..bc8f61e 100644
--- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
@@ -9,15 +9,16 @@
#include "base/memory/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/constrained_window_mac.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "content/public/browser/web_contents.h"
#include "ui/gfx/size.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
#include "ui/web_dialogs/web_dialog_ui.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
using content::WebContents;
-using ui::WebDialogDelegate;
using ui::ConstrainedWebDialogDelegate;
+using ui::WebDialogDelegate;
+using ui::WebDialogWebContentsDelegate;
class ConstrainedWebDialogDelegateMac :
public ConstrainedWindowMacDelegateCustomSheet,
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
index 998e93a..4a34b0c 100644
--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -13,19 +13,20 @@
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/gfx/size.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
using content::NativeWebKeyboardEvent;
using content::WebContents;
using content::WebUIMessageHandler;
using ui::WebDialogDelegate;
using ui::WebDialogUI;
+using ui::WebDialogWebContentsDelegate;
// Thin bridge that routes notifications to
// WebDialogWindowController's member variables.
diff --git a/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
index f1ef9a5..a5d3610 100644
--- a/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
@@ -19,6 +19,7 @@ using content::WebContents;
using ui::ConstrainedWebDialogDelegate;
using ui::ConstrainedWebDialogUI;
using ui::WebDialogDelegate;
+using ui::WebDialogWebContentsDelegate;
class ConstrainedWebDialogDelegateGtk : public ConstrainedWindowGtkDelegate,
public ConstrainedWebDialogDelegate {
diff --git a/chrome/browser/ui/gtk/web_dialog_gtk.cc b/chrome/browser/ui/gtk/web_dialog_gtk.cc
index 38e68bd..d8d8cea 100644
--- a/chrome/browser/ui/gtk/web_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/web_dialog_gtk.cc
@@ -22,6 +22,7 @@ using content::WebContents;
using content::WebUIMessageHandler;
using ui::WebDialogDelegate;
using ui::WebDialogUI;
+using ui::WebDialogWebContentsDelegate;
namespace chrome {
diff --git a/chrome/browser/ui/gtk/web_dialog_gtk.h b/chrome/browser/ui/gtk/web_dialog_gtk.h
index 5c73e0b..e11a172 100644
--- a/chrome/browser/ui/gtk/web_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/web_dialog_gtk.h
@@ -10,11 +10,11 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
typedef struct _GtkWidget GtkWidget;
@@ -25,7 +25,7 @@ namespace content {
class BrowserContext;
}
-class WebDialogGtk : public WebDialogWebContentsDelegate,
+class WebDialogGtk : public ui::WebDialogWebContentsDelegate,
public ui::WebDialogDelegate {
public:
WebDialogGtk(content::BrowserContext* context,
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index d65cc8a..e2bcb3c 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -22,6 +22,7 @@ using content::WebContents;
using ui::ConstrainedWebDialogDelegate;
using ui::ConstrainedWebDialogUI;
using ui::WebDialogDelegate;
+using ui::WebDialogWebContentsDelegate;
namespace {
diff --git a/chrome/browser/ui/views/web_dialog_view.cc b/chrome/browser/ui/views/web_dialog_view.cc
index 2b4312b..fdf08c8 100644
--- a/chrome/browser/ui/views/web_dialog_view.cc
+++ b/chrome/browser/ui/views/web_dialog_view.cc
@@ -33,6 +33,7 @@ using content::WebContents;
using content::WebUIMessageHandler;
using ui::WebDialogDelegate;
using ui::WebDialogUI;
+using ui::WebDialogWebContentsDelegate;
////////////////////////////////////////////////////////////////////////////////
// WebDialogView, public:
diff --git a/chrome/browser/ui/views/web_dialog_view.h b/chrome/browser/ui/views/web_dialog_view.h
index 4a51ed9..6814ac8 100644
--- a/chrome/browser/ui/views/web_dialog_view.h
+++ b/chrome/browser/ui/views/web_dialog_view.h
@@ -10,11 +10,11 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "ui/gfx/size.h"
#include "ui/views/widget/widget_delegate.h"
#include "ui/views/window/client_view.h"
#include "ui/web_dialogs/web_dialog_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
namespace content {
class BrowserContext;
@@ -38,7 +38,7 @@ class WebView;
// instead of inheriting from it to avoid violating the "no multiple
// inheritance" rule.
class WebDialogView : public views::ClientView,
- public WebDialogWebContentsDelegate,
+ public ui::WebDialogWebContentsDelegate,
public ui::WebDialogDelegate,
public views::WidgetDelegate {
public:
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.h b/chrome/browser/ui/webui/chrome_web_contents_handler.h
index 5d6a5a2..7e1d32c 100644
--- a/chrome/browser/ui/webui/chrome_web_contents_handler.h
+++ b/chrome/browser/ui/webui/chrome_web_contents_handler.h
@@ -6,10 +6,10 @@
#define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_CONTENTS_HANDLER_H_
#include "base/compiler_specific.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
class ChromeWebContentsHandler
- : public WebDialogWebContentsDelegate::WebContentsHandler {
+ : public ui::WebDialogWebContentsDelegate::WebContentsHandler {
public:
ChromeWebContentsHandler();
virtual ~ChromeWebContentsHandler();
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
index c390901..2b9d325 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
@@ -20,6 +20,7 @@ using content::NativeWebKeyboardEvent;
using content::WebContents;
using ui::ConstrainedWebDialogUI;
using ui::WebDialogDelegate;
+using ui::WebDialogWebContentsDelegate;
ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase(
Profile* profile,
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
index 75c56c2..a0bc666 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
@@ -7,9 +7,9 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
#include "ui/web_dialogs/constrained_web_dialog_ui.h"
#include "ui/web_dialogs/web_dialog_ui.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
namespace ui {
class WebDialogDelegate;
@@ -18,7 +18,7 @@ class WebDialogDelegate;
// Platform-agnostic base implementation of ConstrainedWebDialogDelegate.
class ConstrainedWebDialogDelegateBase
: public ui::ConstrainedWebDialogDelegate,
- public WebDialogWebContentsDelegate {
+ public ui::WebDialogWebContentsDelegate {
public:
ConstrainedWebDialogDelegateBase(
Profile* profile,
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index f372763..d331bed 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
#include <vector>
@@ -28,6 +28,7 @@ using content::Referrer;
using content::BrowserContext;
using content::WebContents;
using content::WebContentsTester;
+using ui::WebDialogWebContentsDelegate;
namespace {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 65878ee..1da6871 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4205,8 +4205,6 @@
'browser/ui/webui/tracing_ui.h',
'browser/ui/webui/uber/uber_ui.cc',
'browser/ui/webui/uber/uber_ui.h',
- 'browser/ui/webui/web_dialog_web_contents_delegate.cc',
- 'browser/ui/webui/web_dialog_web_contents_delegate.h',
'browser/ui/webui/web_ui_util.cc',
'browser/ui/webui/web_ui_util.h',
'browser/ui/window_sizer/window_sizer.cc',
diff --git a/ui/web_dialogs/constrained_web_dialog_ui.h b/ui/web_dialogs/constrained_web_dialog_ui.h
index 45da6ef..4837c5f 100644
--- a/ui/web_dialogs/constrained_web_dialog_ui.h
+++ b/ui/web_dialogs/constrained_web_dialog_ui.h
@@ -12,7 +12,6 @@
class ConstrainedWindow;
class Profile;
class TabContents;
-class WebDialogWebContentsDelegate;
namespace base {
template<class T> class PropertyAccessor;
@@ -24,6 +23,7 @@ class RenderViewHost;
namespace ui {
class WebDialogDelegate;
+class WebDialogWebContentsDelegate;
class WEB_DIALOGS_EXPORT ConstrainedWebDialogDelegate {
public:
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate.cc b/ui/web_dialogs/web_dialog_web_contents_delegate.cc
index 1742e22..19d97a5 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate.cc
+++ b/ui/web_dialogs/web_dialog_web_contents_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
+#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
#include "base/logging.h"
#include "content/public/browser/web_contents.h"
@@ -11,6 +11,8 @@ using content::BrowserContext;
using content::OpenURLParams;
using content::WebContents;
+namespace ui {
+
// Incognito profiles are not long-lived, so we always want to store a
// non-incognito profile.
//
@@ -57,3 +59,5 @@ bool WebDialogWebContentsDelegate::ShouldAddNavigationToHistory(
content::NavigationType navigation_type) {
return false;
}
+
+} // namespace ui
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate.h b/ui/web_dialogs/web_dialog_web_contents_delegate.h
index a0dd2a9be..e7965c9 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate.h
+++ b/ui/web_dialogs/web_dialog_web_contents_delegate.h
@@ -2,18 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_WEBUI_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
-#define CHROME_BROWSER_UI_WEBUI_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
+#ifndef UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
+#define UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
#include "base/compiler_specific.h"
#include "content/public/browser/web_contents_delegate.h"
+#include "ui/web_dialogs/web_dialogs_export.h"
+
+namespace ui {
// This class implements (and mostly ignores) most of
// content::WebContentsDelegate for use in a Web dialog. Subclasses need only
// override a few methods instead of the everything from
// content::WebContentsDelegate; this way, implementations on all platforms
// behave consistently.
-class WebDialogWebContentsDelegate : public content::WebContentsDelegate {
+class WEB_DIALOGS_EXPORT WebDialogWebContentsDelegate
+ : public content::WebContentsDelegate {
public:
// Handles OpenURLFromTab and AddNewContents for WebDialogWebContentsDelegate.
class WebContentsHandler {
@@ -73,4 +77,6 @@ class WebDialogWebContentsDelegate : public content::WebContentsDelegate {
DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegate);
};
-#endif // CHROME_BROWSER_UI_WEBUI_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
+} // namespace ui
+
+#endif // UI_WEB_DIALOGS_WEB_DIALOG_WEB_CONTENTS_DELEGATE_H_
diff --git a/ui/web_dialogs/web_dialogs.gyp b/ui/web_dialogs/web_dialogs.gyp
index fc32c9a..12be315 100644
--- a/ui/web_dialogs/web_dialogs.gyp
+++ b/ui/web_dialogs/web_dialogs.gyp
@@ -28,6 +28,8 @@
'web_dialog_observer.h',
'web_dialog_ui.cc',
'web_dialog_ui.h',
+ 'web_dialog_web_contents_delegate.cc',
+ 'web_dialog_web_contents_delegate.h',
'web_dialogs_export.h',
],
},
generated by cgit v1.1 at 2025-03-19 19:43:38 +0000