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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 case WebLocalizedString::InputElementAltText: | 163 case WebLocalizedString::InputElementAltText: |
164 return IDS_FORM_INPUT_ALT; | 164 return IDS_FORM_INPUT_ALT; |
165 case WebLocalizedString::KeygenMenuHighGradeKeySize: | 165 case WebLocalizedString::KeygenMenuHighGradeKeySize: |
166 return IDS_KEYGEN_HIGH_GRADE_KEY; | 166 return IDS_KEYGEN_HIGH_GRADE_KEY; |
167 case WebLocalizedString::KeygenMenuMediumGradeKeySize: | 167 case WebLocalizedString::KeygenMenuMediumGradeKeySize: |
168 return IDS_KEYGEN_MED_GRADE_KEY; | 168 return IDS_KEYGEN_MED_GRADE_KEY; |
169 case WebLocalizedString::MissingPluginText: | 169 case WebLocalizedString::MissingPluginText: |
170 return IDS_PLUGIN_INITIALIZATION_ERROR; | 170 return IDS_PLUGIN_INITIALIZATION_ERROR; |
171 case WebLocalizedString::MultipleFileUploadText: | 171 case WebLocalizedString::MultipleFileUploadText: |
172 return IDS_FORM_FILE_MULTIPLE_UPLOAD; | 172 return IDS_FORM_FILE_MULTIPLE_UPLOAD; |
| 173 case WebLocalizedString::OtherColorLabel: |
| 174 return IDS_FORM_OTHER_COLOR_LABEL; |
173 case WebLocalizedString::ResetButtonDefaultLabel: | 175 case WebLocalizedString::ResetButtonDefaultLabel: |
174 return IDS_FORM_RESET_LABEL; | 176 return IDS_FORM_RESET_LABEL; |
175 case WebLocalizedString::SearchableIndexIntroduction: | 177 case WebLocalizedString::SearchableIndexIntroduction: |
176 return IDS_SEARCHABLE_INDEX_INTRO; | 178 return IDS_SEARCHABLE_INDEX_INTRO; |
177 case WebLocalizedString::SearchMenuClearRecentSearchesText: | 179 case WebLocalizedString::SearchMenuClearRecentSearchesText: |
178 return IDS_RECENT_SEARCHES_CLEAR; | 180 return IDS_RECENT_SEARCHES_CLEAR; |
179 case WebLocalizedString::SearchMenuNoRecentSearchesText: | 181 case WebLocalizedString::SearchMenuNoRecentSearchesText: |
180 return IDS_RECENT_SEARCHES_NONE; | 182 return IDS_RECENT_SEARCHES_NONE; |
181 case WebLocalizedString::SearchMenuRecentSearchesText: | 183 case WebLocalizedString::SearchMenuRecentSearchesText: |
182 return IDS_RECENT_SEARCHES; | 184 return IDS_RECENT_SEARCHES; |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
777 worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 779 worker_task_runner->OnWorkerRunLoopStarted(runLoop); |
778 } | 780 } |
779 | 781 |
780 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 782 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( |
781 const WebKit::WebWorkerRunLoop& runLoop) { | 783 const WebKit::WebWorkerRunLoop& runLoop) { |
782 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 784 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
783 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 785 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
784 } | 786 } |
785 | 787 |
786 } // namespace webkit_glue | 788 } // namespace webkit_glue |
OLD | NEW |