| 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient
* chooserClient, const Color&) | 617 PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient
* chooserClient, const Color&) |
| 618 { | 618 { |
| 619 OwnPtr<ColorChooserUIController> controller; | 619 OwnPtr<ColorChooserUIController> controller; |
| 620 if (RuntimeEnabledFeatures::pagePopupEnabled()) | 620 if (RuntimeEnabledFeatures::pagePopupEnabled()) |
| 621 controller = adoptPtr(new ColorChooserPopupUIController(this, chooserCli
ent)); | 621 controller = adoptPtr(new ColorChooserPopupUIController(this, chooserCli
ent)); |
| 622 else | 622 else |
| 623 controller = adoptPtr(new ColorChooserUIController(this, chooserClient))
; | 623 controller = adoptPtr(new ColorChooserUIController(this, chooserClient))
; |
| 624 controller->openUI(); | 624 controller->openUI(); |
| 625 return controller.release(); | 625 return controller.release(); |
| 626 } | 626 } |
| 627 PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChoo
serClient* chooserClient, const WebColor& initialColor) | 627 PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChoo
serClient* chooserClient, const WebColor& initialColor, const Vector<WebColor>&
suggestions) |
| 628 { | 628 { |
| 629 WebViewClient* client = m_webView->client(); | 629 WebViewClient* client = m_webView->client(); |
| 630 if (!client) | 630 if (!client) |
| 631 return nullptr; | 631 return nullptr; |
| 632 return adoptPtr(client->createColorChooser(chooserClient, initialColor)); | 632 return adoptPtr(client->createColorChooser(chooserClient, initialColor, sugg
estions)); |
| 633 } | 633 } |
| 634 | 634 |
| 635 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose
rClient* pickerClient, const DateTimeChooserParameters& parameters) | 635 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose
rClient* pickerClient, const DateTimeChooserParameters& parameters) |
| 636 { | 636 { |
| 637 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) | 637 #if ENABLE(INPUT_MULTIPLE_FIELDS_UI) |
| 638 return DateTimeChooserImpl::create(this, pickerClient, parameters); | 638 return DateTimeChooserImpl::create(this, pickerClient, parameters); |
| 639 #else | 639 #else |
| 640 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); | 640 return ExternalDateTimeChooser::create(this, m_webView->client(), pickerClie
nt, parameters); |
| 641 #endif | 641 #endif |
| 642 } | 642 } |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1009 { | 1009 { |
| 1010 } | 1010 } |
| 1011 | 1011 |
| 1012 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche
me, const String& baseURL, const String& url, const String& title) | 1012 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche
me, const String& baseURL, const String& url, const String& title) |
| 1013 { | 1013 { |
| 1014 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); | 1014 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); |
| 1015 } | 1015 } |
| 1016 #endif | 1016 #endif |
| 1017 | 1017 |
| 1018 } // namespace WebKit | 1018 } // namespace WebKit |
| OLD | NEW |