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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, | 479 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, |
480 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, | 480 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, |
481 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P }, | 481 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P }, |
482 { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P }, | 482 { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P }, |
483 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P }, | 483 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P }, |
484 { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P }, | 484 { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P }, |
485 { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P }, | 485 { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P }, |
486 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P }, | 486 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P }, |
487 { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P }, | 487 { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P }, |
488 { "visaCC", IDR_AUTOFILL_CC_VISA, ui::SCALE_FACTOR_100P }, | 488 { "visaCC", IDR_AUTOFILL_CC_VISA, ui::SCALE_FACTOR_100P }, |
| 489 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, |
489 }; | 490 }; |
490 | 491 |
491 } // namespace | 492 } // namespace |
492 | 493 |
493 WebData WebKitPlatformSupportImpl::loadResource(const char* name) { | 494 WebData WebKitPlatformSupportImpl::loadResource(const char* name) { |
494 // Some clients will call into this method with an empty |name| when they have | 495 // Some clients will call into this method with an empty |name| when they have |
495 // optional resources. For example, the PopupMenuChromium code can have icons | 496 // optional resources. For example, the PopupMenuChromium code can have icons |
496 // for some Autofill items but not for others. | 497 // for some Autofill items but not for others. |
497 if (!strlen(name)) | 498 if (!strlen(name)) |
498 return WebData(); | 499 return WebData(); |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
780 worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 781 worker_task_runner->OnWorkerRunLoopStarted(runLoop); |
781 } | 782 } |
782 | 783 |
783 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 784 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( |
784 const WebKit::WebWorkerRunLoop& runLoop) { | 785 const WebKit::WebWorkerRunLoop& runLoop) { |
785 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 786 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
786 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 787 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
787 } | 788 } |
788 | 789 |
789 } // namespace webkit_glue | 790 } // namespace webkit_glue |
OLD | NEW |