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 "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 | 8 |
9 MSVC_PUSH_WARNING_LEVEL(0); | 9 MSVC_PUSH_WARNING_LEVEL(0); |
10 #include "Cursor.h" | 10 #include "Cursor.h" |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 PassRefPtr<WebCore::FileChooser> fileChoos
er) { | 439 PassRefPtr<WebCore::FileChooser> fileChoos
er) { |
440 WebViewDelegate* delegate = webview_->delegate(); | 440 WebViewDelegate* delegate = webview_->delegate(); |
441 if (!delegate) | 441 if (!delegate) |
442 return; | 442 return; |
443 | 443 |
444 std::wstring suggestion = webkit_glue::StringToStdWString(default_path); | 444 std::wstring suggestion = webkit_glue::StringToStdWString(default_path); |
445 WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChoos
er); | 445 WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChoos
er); |
446 delegate->RunFileChooser(suggestion, chooser); | 446 delegate->RunFileChooser(suggestion, chooser); |
447 } | 447 } |
448 | 448 |
449 void ChromeClientImpl::popupOpened( | 449 void ChromeClientImpl::popupOpened(WebCore::FramelessScrollView* popup_view, |
450 WebCore::FramelessScrollView* popup_view, const WebCore::IntRect& bounds) { | 450 const WebCore::IntRect& bounds, |
| 451 bool focus_on_show) { |
451 WebViewDelegate* d = webview_->delegate(); | 452 WebViewDelegate* d = webview_->delegate(); |
452 if (d) { | 453 if (d) { |
453 WebWidgetImpl* webwidget = | 454 WebWidgetImpl* webwidget = |
454 static_cast<WebWidgetImpl*>(d->CreatePopupWidget(webview_)); | 455 static_cast<WebWidgetImpl*>(d->CreatePopupWidget(webview_, |
| 456 focus_on_show)); |
455 webwidget->Init(popup_view, webkit_glue::FromIntRect(bounds)); | 457 webwidget->Init(popup_view, webkit_glue::FromIntRect(bounds)); |
456 } | 458 } |
457 } | 459 } |
458 | 460 |
459 void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor) { | 461 void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor) { |
460 #if defined(OS_WIN) | 462 #if defined(OS_WIN) |
461 // TODO(pinkerton): figure out the cursor delegate methods | 463 // TODO(pinkerton): figure out the cursor delegate methods |
462 WebViewDelegate* d = webview_->delegate(); | 464 WebViewDelegate* d = webview_->delegate(); |
463 if (d) | 465 if (d) |
464 d->SetCursor(webview_, cursor.impl()); | 466 d->SetCursor(webview_, cursor.impl()); |
465 #endif | 467 #endif |
466 } | 468 } |
OLD | NEW |