OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "AccessibilityObject.h" | 7 #include "AccessibilityObject.h" |
8 #include "AXObjectCache.h" | 8 #include "AXObjectCache.h" |
9 #include "CharacterNames.h" | 9 #include "CharacterNames.h" |
10 #include "Console.h" | 10 #include "Console.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "PopupMenuChromium.h" | 23 #include "PopupMenuChromium.h" |
24 #include "ScriptController.h" | 24 #include "ScriptController.h" |
25 #include "WindowFeatures.h" | 25 #include "WindowFeatures.h" |
26 #if USE(V8) | 26 #if USE(V8) |
27 #include "V8Proxy.h" | 27 #include "V8Proxy.h" |
28 #endif | 28 #endif |
29 #undef LOG | 29 #undef LOG |
30 | 30 |
31 #include "googleurl/src/gurl.h" | 31 #include "googleurl/src/gurl.h" |
32 #include "webkit/api/public/WebCursorInfo.h" | 32 #include "webkit/api/public/WebCursorInfo.h" |
| 33 #include "webkit/api/public/WebFrameClient.h" |
33 #include "webkit/api/public/WebInputEvent.h" | 34 #include "webkit/api/public/WebInputEvent.h" |
34 #include "webkit/api/public/WebKit.h" | 35 #include "webkit/api/public/WebKit.h" |
35 #include "webkit/api/public/WebPopupMenuInfo.h" | 36 #include "webkit/api/public/WebPopupMenuInfo.h" |
36 #include "webkit/api/public/WebRect.h" | 37 #include "webkit/api/public/WebRect.h" |
37 #include "webkit/api/public/WebTextDirection.h" | 38 #include "webkit/api/public/WebTextDirection.h" |
38 #include "webkit/api/public/WebURLRequest.h" | 39 #include "webkit/api/public/WebURLRequest.h" |
39 #include "webkit/api/src/NotificationPresenterImpl.h" | 40 #include "webkit/api/src/NotificationPresenterImpl.h" |
40 #include "webkit/api/src/WrappedResourceRequest.h" | 41 #include "webkit/api/src/WrappedResourceRequest.h" |
41 #include "webkit/glue/chrome_client_impl.h" | 42 #include "webkit/glue/chrome_client_impl.h" |
42 #include "webkit/glue/glue_util.h" | 43 #include "webkit/glue/glue_util.h" |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 | 481 |
481 return screen_rect; | 482 return screen_rect; |
482 } | 483 } |
483 | 484 |
484 PlatformWidget ChromeClientImpl::platformWindow() const { | 485 PlatformWidget ChromeClientImpl::platformWindow() const { |
485 return NULL; | 486 return NULL; |
486 } | 487 } |
487 | 488 |
488 void ChromeClientImpl::contentsSizeChanged(WebCore::Frame* frame, const | 489 void ChromeClientImpl::contentsSizeChanged(WebCore::Frame* frame, const |
489 WebCore::IntSize& size) const { | 490 WebCore::IntSize& size) const { |
490 WebViewDelegate* delegate = webview_->delegate(); | 491 WebFrameImpl* webframe = WebFrameImpl::FromFrame(frame); |
491 | 492 if (webframe->client()) { |
492 if (delegate) { | 493 webframe->client()->didChangeContentsSize( |
493 delegate->DidContentsSizeChange(webview_, size.width(), size.height()); | 494 webframe, webkit_glue::IntSizeToWebSize(size)); |
494 } | 495 } |
495 } | 496 } |
496 | 497 |
497 void ChromeClientImpl::scrollbarsModeDidChange() const { | 498 void ChromeClientImpl::scrollbarsModeDidChange() const { |
498 } | 499 } |
499 | 500 |
500 void ChromeClientImpl::mouseDidMoveOverElement( | 501 void ChromeClientImpl::mouseDidMoveOverElement( |
501 const WebCore::HitTestResult& result, unsigned modifierFlags) { | 502 const WebCore::HitTestResult& result, unsigned modifierFlags) { |
502 // Find out if the mouse is over a link, and if so, let our UI know... somehow | 503 // Find out if the mouse is over a link, and if so, let our UI know... somehow |
503 WebViewDelegate* delegate = webview_->delegate(); | 504 WebViewDelegate* delegate = webview_->delegate(); |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 info->itemHeight = popup_container->menuItemHeight(); | 635 info->itemHeight = popup_container->menuItemHeight(); |
635 info->selectedIndex = popup_container->selectedIndex(); | 636 info->selectedIndex = popup_container->selectedIndex(); |
636 info->items.swap(output_items); | 637 info->items.swap(output_items); |
637 } | 638 } |
638 | 639 |
639 #if ENABLE(NOTIFICATIONS) | 640 #if ENABLE(NOTIFICATIONS) |
640 WebCore::NotificationPresenter* ChromeClientImpl::notificationPresenter() const
{ | 641 WebCore::NotificationPresenter* ChromeClientImpl::notificationPresenter() const
{ |
641 return webview_->GetNotificationPresenter(); | 642 return webview_->GetNotificationPresenter(); |
642 } | 643 } |
643 #endif | 644 #endif |
OLD | NEW |