| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 { | 572 { |
| 573 m_webView->updatePageDefinedViewportConstraints(description); | 573 m_webView->updatePageDefinedViewportConstraints(description); |
| 574 } | 574 } |
| 575 | 575 |
| 576 void ChromeClientImpl::print(LocalFrame* frame) | 576 void ChromeClientImpl::print(LocalFrame* frame) |
| 577 { | 577 { |
| 578 if (m_webView->client()) | 578 if (m_webView->client()) |
| 579 m_webView->client()->printPage(WebLocalFrameImpl::fromFrame(frame)); | 579 m_webView->client()->printPage(WebLocalFrameImpl::fromFrame(frame)); |
| 580 } | 580 } |
| 581 | 581 |
| 582 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalFrame* frame,
ColorChooserClient* chooserClient, const Color&) | 582 PassOwnPtrWillBeRawPtr<ColorChooser> ChromeClientImpl::createColorChooser(LocalF
rame* frame, ColorChooserClient* chooserClient, const Color&) |
| 583 { | 583 { |
| 584 OwnPtr<ColorChooserUIController> controller; | 584 OwnPtrWillBeRawPtr<ColorChooserUIController> controller = nullptr; |
| 585 if (RuntimeEnabledFeatures::pagePopupEnabled()) | 585 if (RuntimeEnabledFeatures::pagePopupEnabled()) |
| 586 controller = adoptPtr(new ColorChooserPopupUIController(frame, this, cho
oserClient)); | 586 controller = ColorChooserPopupUIController::create(frame, this, chooserC
lient); |
| 587 else | 587 else |
| 588 controller = adoptPtr(new ColorChooserUIController(frame, chooserClient)
); | 588 controller = ColorChooserUIController::create(frame, chooserClient); |
| 589 controller->openUI(); | 589 controller->openUI(); |
| 590 return controller.release(); | 590 return controller.release(); |
| 591 } | 591 } |
| 592 | 592 |
| 593 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose
rClient* pickerClient, const DateTimeChooserParameters& parameters) | 593 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose
rClient* pickerClient, const DateTimeChooserParameters& parameters) |
| 594 { | 594 { |
| 595 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) | 595 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) |
| 596 return DateTimeChooserImpl::create(this, pickerClient, parameters); | 596 return DateTimeChooserImpl::create(this, pickerClient, parameters); |
| 597 #else | 597 #else |
| 598 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); | 598 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp
utElement)); | 888 m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inp
utElement)); |
| 889 } | 889 } |
| 890 | 890 |
| 891 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) | 891 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input) |
| 892 { | 892 { |
| 893 if (m_webView->autofillClient()) | 893 if (m_webView->autofillClient()) |
| 894 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); | 894 m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&in
put)); |
| 895 } | 895 } |
| 896 | 896 |
| 897 } // namespace blink | 897 } // namespace blink |
| OLD | NEW |