Commit 7df35752 authored by tfarina@chromium.org's avatar tfarina@chromium.org

Rename HTML_DIALOG to WEB_DIALOG.

R=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10262027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134786 0039d316-1c4b-4281-b951-d872f2087c98
parent 3956f726
...@@ -55,7 +55,7 @@ void ConstrainedWebDialogUI::RenderViewCreated( ...@@ -55,7 +55,7 @@ void ConstrainedWebDialogUI::RenderViewCreated(
base::Unretained(this))); base::Unretained(this)));
content::NotificationService::current()->Notify( content::NotificationService::current()->Notify(
chrome::NOTIFICATION_HTML_DIALOG_SHOWN, chrome::NOTIFICATION_WEB_DIALOG_SHOWN,
content::Source<content::WebUI>(web_ui()), content::Source<content::WebUI>(web_ui()),
content::Details<RenderViewHost>(render_view_host)); content::Details<RenderViewHost>(render_view_host));
} }
......
...@@ -74,7 +74,7 @@ void WebDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { ...@@ -74,7 +74,7 @@ void WebDialogUI::RenderViewCreated(RenderViewHost* render_view_host) {
} }
content::NotificationService::current()->Notify( content::NotificationService::current()->Notify(
chrome::NOTIFICATION_HTML_DIALOG_SHOWN, chrome::NOTIFICATION_WEB_DIALOG_SHOWN,
content::Source<content::WebUI>(web_ui()), content::Source<content::WebUI>(web_ui()),
content::Details<RenderViewHost>(render_view_host)); content::Details<RenderViewHost>(render_view_host));
} }
......
...@@ -82,7 +82,7 @@ enum NotificationType { ...@@ -82,7 +82,7 @@ enum NotificationType {
// Sent after an WebDialog dialog has been shown. The source is the // Sent after an WebDialog dialog has been shown. The source is the
// dialog. The details is a Details<RenderViewHost> with a pointer to the RVH // dialog. The details is a Details<RenderViewHost> with a pointer to the RVH
// for the shown dialog. // for the shown dialog.
NOTIFICATION_HTML_DIALOG_SHOWN, NOTIFICATION_WEB_DIALOG_SHOWN,
// A new tab is created from an existing tab to serve as a target of a // A new tab is created from an existing tab to serve as a target of a
// navigation that is about to happen. The source will be a Source<Profile> // navigation that is about to happen. The source will be a Source<Profile>
......
...@@ -20,8 +20,10 @@ using content::NavigationController; ...@@ -20,8 +20,10 @@ using content::NavigationController;
TestHtmlDialogObserver::TestHtmlDialogObserver( TestHtmlDialogObserver::TestHtmlDialogObserver(
JsInjectionReadyObserver* js_injection_ready_observer) JsInjectionReadyObserver* js_injection_ready_observer)
: js_injection_ready_observer_(js_injection_ready_observer), : js_injection_ready_observer_(js_injection_ready_observer),
web_ui_(NULL), done_(false), running_(false) { web_ui_(NULL),
registrar_.Add(this, chrome::NOTIFICATION_HTML_DIALOG_SHOWN, done_(false),
running_(false) {
registrar_.Add(this, chrome::NOTIFICATION_WEB_DIALOG_SHOWN,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
} }
...@@ -33,13 +35,13 @@ void TestHtmlDialogObserver::Observe( ...@@ -33,13 +35,13 @@ void TestHtmlDialogObserver::Observe(
const content::NotificationSource& source, const content::NotificationSource& source,
const content::NotificationDetails& details) { const content::NotificationDetails& details) {
switch (type) { switch (type) {
case chrome::NOTIFICATION_HTML_DIALOG_SHOWN: case chrome::NOTIFICATION_WEB_DIALOG_SHOWN:
if (js_injection_ready_observer_) { if (js_injection_ready_observer_) {
js_injection_ready_observer_->OnJsInjectionReady( js_injection_ready_observer_->OnJsInjectionReady(
content::Details<content::RenderViewHost>(details).ptr()); content::Details<content::RenderViewHost>(details).ptr());
} }
web_ui_ = content::Source<content::WebUI>(source).ptr(); web_ui_ = content::Source<content::WebUI>(source).ptr();
registrar_.Remove(this, chrome::NOTIFICATION_HTML_DIALOG_SHOWN, registrar_.Remove(this, chrome::NOTIFICATION_WEB_DIALOG_SHOWN,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
// Wait for navigation on the new WebUI instance to complete. This depends // Wait for navigation on the new WebUI instance to complete. This depends
// on receiving the notification of the HtmlDialog being shown before the // on receiving the notification of the HtmlDialog being shown before the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment