Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Unified Diff: webkit/glue/chrome_client_impl.cc

Issue 293001: Delete glue/webview{_delegate}.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/back_forward_list_client_impl.cc ('k') | webkit/glue/context_menu_client_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/chrome_client_impl.cc
===================================================================
--- webkit/glue/chrome_client_impl.cc (revision 29380)
+++ webkit/glue/chrome_client_impl.cc (working copy)
@@ -48,7 +48,6 @@
#include "webkit/glue/webframe_impl.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webpopupmenu_impl.h"
-#include "webkit/glue/webview_delegate.h"
#include "webkit/glue/webview_impl.h"
using WebCore::PopupContainer;
@@ -245,28 +244,27 @@
}
void ChromeClientImpl::show() {
- WebViewDelegate* delegate = webview_->delegate();
- if (delegate) {
- // If our default configuration was modified by a script or wasn't
- // created by a user gesture, then show as a popup. Else, let this
- // new window be opened as a toplevel window.
- //
- bool as_popup =
- !toolbars_visible_ ||
- !statusbar_visible_ ||
- !scrollbars_visible_ ||
- !menubar_visible_ ||
- !resizable_;
+ if (!webview_->client())
+ return;
- WebNavigationPolicy policy = WebKit::WebNavigationPolicyNewForegroundTab;
- if (as_popup)
- policy = WebKit::WebNavigationPolicyNewPopup;
- if (CurrentEventShouldCauseBackgroundTab(
- WebViewImpl::current_input_event()))
- policy = WebKit::WebNavigationPolicyNewBackgroundTab;
+ // If our default configuration was modified by a script or wasn't
+ // created by a user gesture, then show as a popup. Else, let this
+ // new window be opened as a toplevel window.
+ bool as_popup =
+ !toolbars_visible_ ||
+ !statusbar_visible_ ||
+ !scrollbars_visible_ ||
+ !menubar_visible_ ||
+ !resizable_;
- delegate->show(policy);
- }
+ WebNavigationPolicy policy = WebKit::WebNavigationPolicyNewForegroundTab;
+ if (as_popup)
+ policy = WebKit::WebNavigationPolicyNewPopup;
+ if (CurrentEventShouldCauseBackgroundTab(
+ WebViewImpl::current_input_event()))
+ policy = WebKit::WebNavigationPolicyNewBackgroundTab;
+
+ webview_->client()->show(policy);
}
bool ChromeClientImpl::canRunModal() {
« no previous file with comments | « webkit/glue/back_forward_list_client_impl.cc ('k') | webkit/glue/context_menu_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698