Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: Source/WebKit/chromium/src/ChromeClientImpl.cpp

Issue 11419080: Merge 132895 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChoo serClient* chooserClient, const WebColor& initialColor) 699 PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChoo serClient* chooserClient, const WebColor& initialColor)
700 { 700 {
701 WebViewClient* client = m_webView->client(); 701 WebViewClient* client = m_webView->client();
702 if (!client) 702 if (!client)
703 return nullptr; 703 return nullptr;
704 return adoptPtr(client->createColorChooser(chooserClient, initialColor)); 704 return adoptPtr(client->createColorChooser(chooserClient, initialColor));
705 } 705 }
706 #endif 706 #endif
707 707
708 #if ENABLE(CALENDAR_PICKER) 708 #if ENABLE(CALENDAR_PICKER)
709 PassOwnPtr<WebCore::DateTimeChooser> ChromeClientImpl::openDateTimeChooser(WebCo re::DateTimeChooserClient* pickerClient, const WebCore::DateTimeChooserParameter s& parameters) 709 PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChoose rClient* pickerClient, const DateTimeChooserParameters& parameters)
710 { 710 {
711 return adoptPtr(new DateTimeChooserImpl(this, pickerClient, parameters)); 711 return DateTimeChooserImpl::create(this, pickerClient, parameters);
712 } 712 }
713 #endif 713 #endif
714 714
715 void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh ooser) 715 void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh ooser)
716 { 716 {
717 WebViewClient* client = m_webView->client(); 717 WebViewClient* client = m_webView->client();
718 if (!client) 718 if (!client)
719 return; 719 return;
720 720
721 WebFileChooserParams params; 721 WebFileChooserParams params;
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 { 1143 {
1144 } 1144 }
1145 1145
1146 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) 1146 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title)
1147 { 1147 {
1148 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); 1148 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
1149 } 1149 }
1150 #endif 1150 #endif
1151 1151
1152 } // namespace WebKit 1152 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/ChromeClientImpl.h ('k') | Source/WebKit/chromium/src/DateTimeChooserImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698