| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <malloc.h> | 8 #include <malloc.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 case WebLocalizedString::KeygenMenuHighGradeKeySize: | 192 case WebLocalizedString::KeygenMenuHighGradeKeySize: |
| 193 return IDS_KEYGEN_HIGH_GRADE_KEY; | 193 return IDS_KEYGEN_HIGH_GRADE_KEY; |
| 194 case WebLocalizedString::KeygenMenuMediumGradeKeySize: | 194 case WebLocalizedString::KeygenMenuMediumGradeKeySize: |
| 195 return IDS_KEYGEN_MED_GRADE_KEY; | 195 return IDS_KEYGEN_MED_GRADE_KEY; |
| 196 case WebLocalizedString::MissingPluginText: | 196 case WebLocalizedString::MissingPluginText: |
| 197 return IDS_PLUGIN_INITIALIZATION_ERROR; | 197 return IDS_PLUGIN_INITIALIZATION_ERROR; |
| 198 case WebLocalizedString::MultipleFileUploadText: | 198 case WebLocalizedString::MultipleFileUploadText: |
| 199 return IDS_FORM_FILE_MULTIPLE_UPLOAD; | 199 return IDS_FORM_FILE_MULTIPLE_UPLOAD; |
| 200 case WebLocalizedString::OtherColorLabel: | 200 case WebLocalizedString::OtherColorLabel: |
| 201 return IDS_FORM_OTHER_COLOR_LABEL; | 201 return IDS_FORM_OTHER_COLOR_LABEL; |
| 202 case WebLocalizedString::OtherDateLabel: |
| 203 return IDS_FORM_OTHER_DATE_LABEL; |
| 202 case WebLocalizedString::ResetButtonDefaultLabel: | 204 case WebLocalizedString::ResetButtonDefaultLabel: |
| 203 return IDS_FORM_RESET_LABEL; | 205 return IDS_FORM_RESET_LABEL; |
| 204 case WebLocalizedString::SearchableIndexIntroduction: | 206 case WebLocalizedString::SearchableIndexIntroduction: |
| 205 return IDS_SEARCHABLE_INDEX_INTRO; | 207 return IDS_SEARCHABLE_INDEX_INTRO; |
| 206 case WebLocalizedString::SearchMenuClearRecentSearchesText: | 208 case WebLocalizedString::SearchMenuClearRecentSearchesText: |
| 207 return IDS_RECENT_SEARCHES_CLEAR; | 209 return IDS_RECENT_SEARCHES_CLEAR; |
| 208 case WebLocalizedString::SearchMenuNoRecentSearchesText: | 210 case WebLocalizedString::SearchMenuNoRecentSearchesText: |
| 209 return IDS_RECENT_SEARCHES_NONE; | 211 return IDS_RECENT_SEARCHES_NONE; |
| 210 case WebLocalizedString::SearchMenuRecentSearchesText: | 212 case WebLocalizedString::SearchMenuRecentSearchesText: |
| 211 return IDS_RECENT_SEARCHES; | 213 return IDS_RECENT_SEARCHES; |
| (...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 829 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
| 828 } | 830 } |
| 829 | 831 |
| 830 #if defined(OS_ANDROID) | 832 #if defined(OS_ANDROID) |
| 831 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { | 833 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { |
| 832 return new FlingAnimatorImpl(); | 834 return new FlingAnimatorImpl(); |
| 833 } | 835 } |
| 834 #endif | 836 #endif |
| 835 | 837 |
| 836 } // namespace webkit_glue | 838 } // namespace webkit_glue |
| OLD | NEW |