diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 18:02:07 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 18:02:07 +0000 |
| commit | 3ab9cb81731759c6e11f8c5296c1b75a7d2dadf1 (patch) | |
| tree | 9344ece34a634b18d3e226c738471159d32484a6 /chrome/browser/sidebar | |
| parent | eadd4e31649b1a9da5d47864ff26ccd06b45edba (diff) | |
| download | chromium_src-3ab9cb81731759c6e11f8c5296c1b75a7d2dadf1.zip chromium_src-3ab9cb81731759c6e11f8c5296c1b75a7d2dadf1.tar.gz chromium_src-3ab9cb81731759c6e11f8c5296c1b75a7d2dadf1.tar.bz2 | |
Remove JS dialog dependency from content.
BUG=71097
TEST=all types of javascript dialogs work, onbeforeunload dialogs work too
Review URL: http://codereview.chromium.org/7096016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
| -rw-r--r-- | chrome/browser/sidebar/sidebar_container.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sidebar/sidebar_container.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc index d1e4a33..4013537 100644 --- a/chrome/browser/sidebar/sidebar_container.cc +++ b/chrome/browser/sidebar/sidebar_container.cc @@ -6,6 +6,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/extensions/extension_sidebar_defaults.h" @@ -108,6 +109,11 @@ bool SidebarContainer::IsPopup(const TabContents* source) const { return false; } +content::JavaScriptDialogCreator* +SidebarContainer::GetJavaScriptDialogCreator() { + return GetJavaScriptDialogCreatorInstance(); +} + void SidebarContainer::OnImageLoaded(SkBitmap* image, const ExtensionResource& resource, int index) { diff --git a/chrome/browser/sidebar/sidebar_container.h b/chrome/browser/sidebar/sidebar_container.h index 0fe1cb3..f7b527e 100644 --- a/chrome/browser/sidebar/sidebar_container.h +++ b/chrome/browser/sidebar/sidebar_container.h @@ -113,6 +113,8 @@ class SidebarContainer virtual void MoveContents(TabContents* source, const gfx::Rect& pos) {} virtual bool IsPopup(const TabContents* source) const; virtual void UpdateTargetURL(TabContents* source, const GURL& url) {} + virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator() + OVERRIDE; // Overridden from ImageLoadingTracker::Observer. virtual void OnImageLoaded(SkBitmap* image, |