OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 ui::SCALE_FACTOR_NONE }, | 884 ui::SCALE_FACTOR_NONE }, |
885 { "PluginPlaceholderElement.js", | 885 { "PluginPlaceholderElement.js", |
886 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, | 886 IDR_PRIVATE_SCRIPT_PLUGINPLACEHOLDERELEMENT_JS, ui::SCALE_FACTOR_NONE }, |
887 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, | 887 { "PrivateScriptRunner.js", IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, |
888 ui::SCALE_FACTOR_NONE }, | 888 ui::SCALE_FACTOR_NONE }, |
889 #ifdef IDR_PICKER_COMMON_JS | 889 #ifdef IDR_PICKER_COMMON_JS |
890 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, | 890 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, |
891 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, | 891 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, |
892 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 892 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
893 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 893 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 894 { "listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 895 { "listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
894 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, | 896 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, |
895 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 897 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
896 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 898 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
897 { "colorSuggestionPicker.js", | 899 { "colorSuggestionPicker.js", |
898 IDR_COLOR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, | 900 IDR_COLOR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
899 { "colorSuggestionPicker.css", | 901 { "colorSuggestionPicker.css", |
900 IDR_COLOR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, | 902 IDR_COLOR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
901 #endif | 903 #endif |
902 }; | 904 }; |
903 | 905 |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1237 } | 1239 } |
1238 | 1240 |
1239 // static | 1241 // static |
1240 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1242 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
1241 WebThreadImplForMessageLoop* impl = | 1243 WebThreadImplForMessageLoop* impl = |
1242 static_cast<WebThreadImplForMessageLoop*>(thread); | 1244 static_cast<WebThreadImplForMessageLoop*>(thread); |
1243 delete impl; | 1245 delete impl; |
1244 } | 1246 } |
1245 | 1247 |
1246 } // namespace content | 1248 } // namespace content |
OLD | NEW |