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

Side by Side Diff: Source/core/platform/PlatformSpeechSynthesizer.cpp

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years 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
« no previous file with comments | « Source/core/platform/Pasteboard.cpp ('k') | Source/core/platform/ScrollAnimatorNone.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/platform/PlatformSpeechSynthesizer.h" 27 #include "core/platform/PlatformSpeechSynthesizer.h"
28 28
29 #include "core/platform/PlatformSpeechSynthesisUtterance.h" 29 #include "core/platform/PlatformSpeechSynthesisUtterance.h"
30 #include "core/platform/PlatformSpeechSynthesisVoice.h"
31 #include "core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h" 30 #include "core/platform/chromium/support/WebSpeechSynthesizerClientImpl.h"
32 #include "public/platform/Platform.h" 31 #include "public/platform/Platform.h"
33 #include "public/platform/WebSpeechSynthesisUtterance.h" 32 #include "public/platform/WebSpeechSynthesisUtterance.h"
34 #include "public/platform/WebSpeechSynthesizer.h" 33 #include "public/platform/WebSpeechSynthesizer.h"
35 #include "public/platform/WebSpeechSynthesizerClient.h" 34 #include "public/platform/WebSpeechSynthesizerClient.h"
36 #include "wtf/RetainPtr.h" 35 #include "wtf/RetainPtr.h"
37 36
38 namespace WebCore { 37 namespace WebCore {
39 38
40 PassOwnPtr<PlatformSpeechSynthesizer> PlatformSpeechSynthesizer::create(Platform SpeechSynthesizerClient* client) 39 PassOwnPtr<PlatformSpeechSynthesizer> PlatformSpeechSynthesizer::create(Platform SpeechSynthesizerClient* client)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 m_voiceList = voices; 85 m_voiceList = voices;
87 } 86 }
88 87
89 void PlatformSpeechSynthesizer::initializeVoiceList() 88 void PlatformSpeechSynthesizer::initializeVoiceList()
90 { 89 {
91 if (m_webSpeechSynthesizer.get()) 90 if (m_webSpeechSynthesizer.get())
92 m_webSpeechSynthesizer->updateVoiceList(); 91 m_webSpeechSynthesizer->updateVoiceList();
93 } 92 }
94 93
95 } // namespace WebCore 94 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/Pasteboard.cpp ('k') | Source/core/platform/ScrollAnimatorNone.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698