| 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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 747 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, | 747 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, |
| 748 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, | 748 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, |
| 749 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, | 749 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, |
| 750 { "searchMagnifierResults", | 750 { "searchMagnifierResults", |
| 751 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, | 751 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, |
| 752 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, | 752 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, |
| 753 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, | 753 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, |
| 754 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, | 754 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, |
| 755 { "generatePasswordHover", | 755 { "generatePasswordHover", |
| 756 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, | 756 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, |
| 757 #ifdef IDR_PICKER_COMMON_JS |
| 758 { "pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE }, |
| 759 { "pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE }, |
| 760 { "calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 761 { "calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 762 { "pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE }, |
| 763 { "suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 764 { "suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 765 { "colorSuggestionPicker.js", |
| 766 IDR_COLOR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE }, |
| 767 { "colorSuggestionPicker.css", |
| 768 IDR_COLOR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE }, |
| 769 #endif |
| 757 }; | 770 }; |
| 758 | 771 |
| 759 } // namespace | 772 } // namespace |
| 760 | 773 |
| 761 WebData BlinkPlatformImpl::loadResource(const char* name) { | 774 WebData BlinkPlatformImpl::loadResource(const char* name) { |
| 762 // Some clients will call into this method with an empty |name| when they have | 775 // Some clients will call into this method with an empty |name| when they have |
| 763 // optional resources. For example, the PopupMenuChromium code can have icons | 776 // optional resources. For example, the PopupMenuChromium code can have icons |
| 764 // for some Autofill items but not for others. | 777 // for some Autofill items but not for others. |
| 765 if (!strlen(name)) | 778 if (!strlen(name)) |
| 766 return WebData(); | 779 return WebData(); |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1100 } | 1113 } |
| 1101 | 1114 |
| 1102 // static | 1115 // static |
| 1103 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1116 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
| 1104 WebThreadImplForMessageLoop* impl = | 1117 WebThreadImplForMessageLoop* impl = |
| 1105 static_cast<WebThreadImplForMessageLoop*>(thread); | 1118 static_cast<WebThreadImplForMessageLoop*>(thread); |
| 1106 delete impl; | 1119 delete impl; |
| 1107 } | 1120 } |
| 1108 | 1121 |
| 1109 } // namespace content | 1122 } // namespace content |
| OLD | NEW |