| 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 <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 {"pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE, true}, | 599 {"pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE, true}, |
| 600 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE, | 600 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE, |
| 601 true}, | 601 true}, |
| 602 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE, | 602 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE, |
| 603 true}, | 603 true}, |
| 604 {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS, | 604 {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS, |
| 605 ui::SCALE_FACTOR_NONE, true}, | 605 ui::SCALE_FACTOR_NONE, true}, |
| 606 {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS, | 606 {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS, |
| 607 ui::SCALE_FACTOR_NONE, true}, | 607 ui::SCALE_FACTOR_NONE, true}, |
| 608 #endif | 608 #endif |
| 609 {"placeholderIcon", IDR_PLACEHOLDER_ICON, ui::SCALE_FACTOR_100P, false}, |
| 609 }; | 610 }; |
| 610 | 611 |
| 611 } // namespace | 612 } // namespace |
| 612 | 613 |
| 613 WebData BlinkPlatformImpl::GetDataResource(const char* name) { | 614 WebData BlinkPlatformImpl::GetDataResource(const char* name) { |
| 614 // Some clients will call into this method with an empty |name| when they have | 615 // Some clients will call into this method with an empty |name| when they have |
| 615 // optional resources. For example, the PopupMenuChromium code can have icons | 616 // optional resources. For example, the PopupMenuChromium code can have icons |
| 616 // for some Autofill items but not for others. | 617 // for some Autofill items but not for others. |
| 617 if (!strlen(name)) | 618 if (!strlen(name)) |
| 618 return WebData(); | 619 return WebData(); |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 851 | 852 |
| 852 std::unique_ptr<blink::WebFeaturePolicy> | 853 std::unique_ptr<blink::WebFeaturePolicy> |
| 853 BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin( | 854 BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin( |
| 854 const blink::WebFeaturePolicy& policy, | 855 const blink::WebFeaturePolicy& policy, |
| 855 const blink::WebSecurityOrigin& new_origin) { | 856 const blink::WebSecurityOrigin& new_origin) { |
| 856 return FeaturePolicy::CreateFromPolicyWithOrigin( | 857 return FeaturePolicy::CreateFromPolicyWithOrigin( |
| 857 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); | 858 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); |
| 858 } | 859 } |
| 859 | 860 |
| 860 } // namespace content | 861 } // namespace content |
| OLD | NEW |