| Index: chrome/browser/extensions/extension_host.h
|
| diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
|
| index 12b43c9154bf628d5b12ef67ecd69c1fb13b36a3..d9ff3caae61570d9276ffead949688f6a6bbd886 100644
|
| --- a/chrome/browser/extensions/extension_host.h
|
| +++ b/chrome/browser/extensions/extension_host.h
|
| @@ -13,7 +13,7 @@
|
| #include "base/perftimer.h"
|
| #include "chrome/browser/extensions/extension_function_dispatcher.h"
|
| #include "chrome/common/view_type.h"
|
| -#include "content/public/browser/javascript_dialogs.h"
|
| +#include "content/public/browser/javascript_dialog_manager.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/web_contents_delegate.h"
|
| @@ -124,7 +124,7 @@ class ExtensionHost : public content::WebContentsDelegate,
|
| // Insert a default style sheet for Extension Infobars.
|
| void InsertInfobarCSS();
|
|
|
| - // Notifications from the JavaScriptDialogCreator when a dialog is being
|
| + // Notifications from the JavaScriptDialogManager when a dialog is being
|
| // opened/closed.
|
| void WillRunJavaScriptDialog();
|
| void DidCloseJavaScriptDialog();
|
| @@ -154,8 +154,8 @@ class ExtensionHost : public content::WebContentsDelegate,
|
| const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
| virtual void ResizeDueToAutoResize(content::WebContents* source,
|
| const gfx::Size& new_size) OVERRIDE;
|
| - virtual content::JavaScriptDialogCreator*
|
| - GetJavaScriptDialogCreator() OVERRIDE;
|
| + virtual content::JavaScriptDialogManager*
|
| + GetJavaScriptDialogManager() OVERRIDE;
|
| virtual void RunFileChooser(
|
| content::WebContents* tab,
|
| const content::FileChooserParams& params) OVERRIDE;
|
| @@ -229,7 +229,7 @@ class ExtensionHost : public content::WebContentsDelegate,
|
| // Used to create dialog boxes.
|
| // It must outlive host_contents_ as host_contents_ will access it
|
| // during destruction.
|
| - scoped_ptr<content::JavaScriptDialogCreator> dialog_creator_;
|
| + scoped_ptr<content::JavaScriptDialogManager> dialog_manager_;
|
|
|
| // The host for our HTML content.
|
| scoped_ptr<content::WebContents> host_contents_;
|
|
|