| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012, 2013 Apple 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 INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE 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 INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE 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 #ifndef CaptionUserPreferences_h | 26 #ifndef CaptionUserPreferences_h |
| 27 #define CaptionUserPreferences_h | 27 #define CaptionUserPreferences_h |
| 28 | 28 |
| 29 #include "Language.h" | |
| 30 #include "LocalizedStrings.h" | |
| 31 #include "TextTrack.h" | 29 #include "TextTrack.h" |
| 32 #include "Timer.h" | 30 #include "core/platform/Language.h" |
| 31 #include "core/platform/LocalizedStrings.h" |
| 32 #include "core/platform/Timer.h" |
| 33 #include <wtf/PassOwnPtr.h> | 33 #include <wtf/PassOwnPtr.h> |
| 34 #include <wtf/text/AtomicString.h> | 34 #include <wtf/text/AtomicString.h> |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace WebCore { |
| 37 | 37 |
| 38 class HTMLMediaElement; | 38 class HTMLMediaElement; |
| 39 class PageGroup; | 39 class PageGroup; |
| 40 class TextTrackList; | 40 class TextTrackList; |
| 41 | 41 |
| 42 class CaptionUserPreferences { | 42 class CaptionUserPreferences { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 Timer<CaptionUserPreferences> m_timer; | 89 Timer<CaptionUserPreferences> m_timer; |
| 90 String m_userPreferredLanguage; | 90 String m_userPreferredLanguage; |
| 91 bool m_testingMode; | 91 bool m_testingMode; |
| 92 bool m_havePreferences; | 92 bool m_havePreferences; |
| 93 bool m_shouldShowCaptions; | 93 bool m_shouldShowCaptions; |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 } | 96 } |
| 97 | 97 |
| 98 #endif | 98 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 14488003:
Absolutify paths to platform/. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk