summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chrome_content_browser_client.cc1
-rw-r--r--chrome/browser/policy/configuration_policy_handler_list_factory.cc5
-rw-r--r--chrome/browser/policy/policy_browsertest.cc25
-rw-r--r--chrome/common/chrome_switches.cc4
-rw-r--r--chrome/common/chrome_switches.h1
-rw-r--r--chrome/renderer/chrome_render_process_observer.cc3
-rw-r--r--content/browser/renderer_host/render_view_host_impl.cc38
-rw-r--r--content/browser/renderer_host/render_view_host_impl.h7
-rw-r--r--content/common/view_messages.h5
-rw-r--r--content/renderer/render_view_impl.cc22
-rw-r--r--content/renderer/render_view_impl.h1
-rw-r--r--content/renderer/render_widget.h1
12 files changed, 0 insertions, 113 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 2c5095b..be00c5c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1472,7 +1472,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kEnableNewBookmarkApps,
switches::kEnableOutOfProcessPdf,
switches::kEnablePluginPlaceholderShadowDom,
- switches::kEnableShowModalDialog,
switches::kJavaScriptHarmony,
switches::kMessageLoopHistogrammer,
switches::kPlaybackMode,
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 46b96ee..8735ec6 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -516,11 +516,6 @@ void GetDeprecatedFeaturesMap(
ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
// Maps feature tags as specified in policy to the corresponding switch to
// re-enable them.
- // TODO(atwilson): Remove after 2015-04-30 per http://crbug.com/374782.
- result->push_back(new StringMappingListPolicyHandler::MappingEntry(
- "ShowModalDialog_EffectiveUntil20150430",
- scoped_ptr<base::Value>(new base::StringValue(
- switches::kEnableShowModalDialog))));
}
#endif // !defined(OS_IOS)
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 3477286..2fb6530 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -3602,31 +3602,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingWhitelist) {
prefs, "other.host.name"));
}
-IN_PROC_BROWSER_TEST_F(PolicyTest,
- EnableDeprecatedWebPlatformFeatures_ShowModalDialog) {
- base::ListValue enabled_features;
- enabled_features.Append(new base::StringValue(
- "ShowModalDialog_EffectiveUntil20150430"));
- PolicyMap policies;
- policies.Set(key::kEnableDeprecatedWebPlatformFeatures,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- enabled_features.DeepCopy(),
- NULL);
- UpdateProviderPolicy(policies);
-
- // Policy only takes effect on new browsers, not existing browsers, so create
- // a new browser.
- Browser* browser2 = CreateBrowser(browser()->profile());
- ui_test_utils::NavigateToURL(browser2, GURL(url::kAboutBlankURL));
- bool result = false;
- EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
- browser2->tab_strip_model()->GetActiveWebContents(),
- "domAutomationController.send(window.showModalDialog !== undefined);",
- &result));
- EXPECT_TRUE(result);
-}
-
#endif // !defined(CHROME_OS)
} // namespace policy
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 82c9410..d98ea73 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -540,10 +540,6 @@ const char kEnableSdchOverHttps[] = "enable-sdch-over-https";
// Enables using bubbles for session restore request instead of infobars.
const char kEnableSessionCrashedBubble[] = "enable-session-crashed-bubble";
-// Enables the deprecated window.showModalDialog API. This is slated for
-// removal.
-const char kEnableShowModalDialog[] = "enable-show-modal-dialog";
-
// Enable or disable settings in a separate browser window per profile
// (see SettingsWindowEnabled() below).
const char kEnableSettingsWindow[] = "enable-settings-window";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3261fdf..d07642c 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -159,7 +159,6 @@ extern const char kEnableSavePasswordBubble[];
extern const char kEnableSdchOverHttps[];
extern const char kEnableSessionCrashedBubble[];
extern const char kEnableSettingsWindow[];
-extern const char kEnableShowModalDialog[];
extern const char kDisableSettingsWindow[];
extern const char kEnableSpdy4[];
extern const char kEnableSSLConnectJobWaiting[];
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 0987379..c1c97c6 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -219,9 +219,6 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver(
WebRuntimeFeatures::enableRequestAutocomplete(true);
#endif
- if (command_line.HasSwitch(switches::kEnableShowModalDialog))
- WebRuntimeFeatures::enableShowModalDialog(true);
-
if (command_line.HasSwitch(switches::kDisableJavaScriptHarmonyShipping)) {
std::string flag("--noharmony-shipping");
v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size()));
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index b5839aa..aee80e4 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -193,8 +193,6 @@ RenderViewHostImpl::RenderViewHostImpl(
is_active_(!swapped_out),
is_swapped_out_(swapped_out),
main_frame_routing_id_(main_frame_routing_id),
- run_modal_reply_msg_(NULL),
- run_modal_opener_id_(MSG_ROUTING_NONE),
is_waiting_for_close_ack_(false),
render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING),
virtual_keyboard_requested_(false),
@@ -864,7 +862,6 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget)
IPC_MESSAGE_HANDLER(ViewHostMsg_ShowFullscreenWidget,
OnShowFullscreenWidget)
- IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnRunModal)
IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady)
IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateState, OnUpdateState)
IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateTargetURL, OnUpdateTargetURL)
@@ -899,21 +896,6 @@ void RenderViewHostImpl::Init() {
}
void RenderViewHostImpl::Shutdown() {
- // If we are being run modally (see RunModal), then we need to cleanup.
- if (run_modal_reply_msg_) {
- Send(run_modal_reply_msg_);
- run_modal_reply_msg_ = NULL;
- RenderViewHostImpl* opener =
- RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_);
- if (opener) {
- opener->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(
- hung_renderer_delay_ms_));
- // Balance out the decrement when we got created.
- opener->increment_in_flight_event_count();
- }
- run_modal_opener_id_ = MSG_ROUTING_NONE;
- }
-
// We can't release the SessionStorageNamespace until our peer
// in the renderer has wound down.
if (GetProcess()->HasConnection()) {
@@ -1002,26 +984,6 @@ void RenderViewHostImpl::OnShowFullscreenWidget(int route_id) {
Send(new ViewMsg_Move_ACK(route_id));
}
-void RenderViewHostImpl::OnRunModal(int opener_id, IPC::Message* reply_msg) {
- DCHECK(!run_modal_reply_msg_);
- run_modal_reply_msg_ = reply_msg;
- run_modal_opener_id_ = opener_id;
-
- RecordAction(base::UserMetricsAction("ShowModalDialog"));
-
- RenderViewHostImpl* opener =
- RenderViewHostImpl::FromID(GetProcess()->GetID(), run_modal_opener_id_);
- if (opener) {
- opener->StopHangMonitorTimeout();
- // The ack for the mouse down won't come until the dialog closes, so fake it
- // so that we don't get a timeout.
- opener->decrement_in_flight_event_count();
- }
-
- // TODO(darin): Bug 1107929: Need to inform our delegate to show this view in
- // an app-modal fashion.
-}
-
void RenderViewHostImpl::OnRenderViewReady() {
render_view_termination_status_ = base::TERMINATION_STATUS_STILL_RUNNING;
SendScreenRects();
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 71bb0a7a..3cc9cc6 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -328,7 +328,6 @@ class CONTENT_EXPORT RenderViewHostImpl
bool user_gesture);
void OnShowWidget(int route_id, const gfx::Rect& initial_rect);
void OnShowFullscreenWidget(int route_id);
- void OnRunModal(int opener_id, IPC::Message* reply_msg);
void OnRenderViewReady();
void OnRenderProcessGone(int status, int error_code);
void OnUpdateState(int32 page_id, const PageState& state);
@@ -423,12 +422,6 @@ class CONTENT_EXPORT RenderViewHostImpl
// Routing ID for the main frame's RenderFrameHost.
int main_frame_routing_id_;
- // If we were asked to RunModal, then this will hold the reply_msg that we
- // must return to the renderer to unblock it.
- IPC::Message* run_modal_reply_msg_;
- // This will hold the routing id of the RenderView that opened us.
- int run_modal_opener_id_;
-
// Set to true when waiting for a ViewHostMsg_ClosePageACK.
// TODO(creis): Move to RenderFrameHost and RenderWidgetHost.
// See http://crbug.com/418265.
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 3499625..1cb5442 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -1065,11 +1065,6 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_ShowWidget,
IPC_MESSAGE_ROUTED1(ViewHostMsg_ShowFullscreenWidget,
int /* route_id */)
-// This message is sent after ViewHostMsg_ShowView to cause the RenderView
-// to run in a modal fashion until it is closed.
-IPC_SYNC_MESSAGE_ROUTED1_0(ViewHostMsg_RunModal,
- int /* opener_id */)
-
// Indicates the renderer is ready in response to a ViewMsg_New or
// a ViewMsg_CreatingNew_ACK.
IPC_MESSAGE_ROUTED0(ViewHostMsg_RenderViewReady)
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f4c0c44..19fb20a 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2025,28 +2025,6 @@ void RenderViewImpl::show(WebNavigationPolicy policy) {
SetPendingWindowRect(initial_rect_);
}
-void RenderViewImpl::runModal() {
- DCHECK(did_show_) << "should already have shown the view";
-
- // Don't allow further dialogs if we are waiting to swap out, since the
- // PageGroupLoadDeferrer in our stack prevents it.
- if (suppress_dialogs_until_swap_out_)
- return;
-
- // We must keep WebKit's shared timer running in this case in order to allow
- // showModalDialog to function properly.
- //
- // TODO(darin): WebKit should really be smarter about suppressing events and
- // timers so that we do not need to manage the shared timer in such a heavy
- // handed manner.
- //
- if (RenderThreadImpl::current()) // Will be NULL during unit tests.
- RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
-
- SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
- routing_id_, opener_id_));
-}
-
bool RenderViewImpl::requestPointerLock() {
return mouse_lock_dispatcher_->LockMouse(webwidget_mouse_lock_target_.get());
}
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 91b69fb..506a0ba 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -333,7 +333,6 @@ class CONTENT_EXPORT RenderViewImpl
virtual void didFocus();
virtual void didBlur();
virtual void show(blink::WebNavigationPolicy policy);
- virtual void runModal();
virtual bool requestPointerLock();
virtual void requestPointerUnlock();
virtual bool isPointerLocked();
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 172a5f2..50392c9 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -176,7 +176,6 @@ class CONTENT_EXPORT RenderWidget
virtual void didChangeCursor(const blink::WebCursorInfo&);
virtual void closeWidgetSoon();
virtual void show(blink::WebNavigationPolicy);
- virtual void runModal() {}
virtual blink::WebRect windowRect();
virtual void setToolTipText(const blink::WebString& text,
blink::WebTextDirection hint);
generated by cgit v1.1 at 2025-03-01 10:04:00 +0000