Delete glue/webview{_delegate}.h

webkit/glue/chrome_client_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "AccessibilityObject.h"
 #include "AXObjectCache.h"
 #include "CharacterNames.h"
 #include "Console.h"
@@ skipping 30 matching lines @@
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/api/public/WebViewClient.h"
 #include "webkit/api/src/NotificationPresenterImpl.h"
 #include "webkit/api/src/WebFileChooserCompletionImpl.h"
 #include "webkit/api/src/WrappedResourceRequest.h"
 #include "webkit/glue/chrome_client_impl.h"
 #include "webkit/glue/glue_util.h"
 #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;
 using WebCore::PopupItem;
 
 using WebKit::WebAccessibilityObject;
 using WebKit::WebConsoleMessage;
 using WebKit::WebCursorInfo;
 using WebKit::WebFileChooserCompletionImpl;
 using WebKit::WebInputEvent;
@@ skipping 176 matching lines @@
   bool meta = mouse_event->modifiers & WebMouseEvent::MetaKey;
 
   if (!WebViewImpl::NavigationPolicyFromMouseEvent(button_number, ctrl,
       shift, alt, meta, &policy))
     return false;
 
   return policy == WebKit::WebNavigationPolicyNewBackgroundTab;
 }
 
 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() {
   return webview_->client() != NULL;
 }
 
 void ChromeClientImpl::runModal() {
   if (webview_->client())
     webview_->client()->runModal();
 }
@@ skipping 340 matching lines @@
   info->itemHeight = popup_container->menuItemHeight();
   info->selectedIndex = popup_container->selectedIndex();
   info->items.swap(output_items);
 }
 
 #if ENABLE(NOTIFICATIONS)
 WebCore::NotificationPresenter* ChromeClientImpl::notificationPresenter() const {
   return webview_->GetNotificationPresenter();
 }
 #endif