Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: webkit/glue/webkitclient_impl.cc

Issue 6516002: Move CC icons to chrome/common and implement loadPlatformResource in RendererWebKitClientImpl. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/webkitclient_impl.h" 5 #include "webkit/glue/webkitclient_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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 { "panIcon", IDR_PAN_SCROLL_ICON }, 362 { "panIcon", IDR_PAN_SCROLL_ICON },
363 { "searchCancel", IDR_SEARCH_CANCEL }, 363 { "searchCancel", IDR_SEARCH_CANCEL },
364 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, 364 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
365 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, 365 { "searchMagnifier", IDR_SEARCH_MAGNIFIER },
366 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, 366 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
367 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, 367 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
368 { "tickmarkDash", IDR_TICKMARK_DASH }, 368 { "tickmarkDash", IDR_TICKMARK_DASH },
369 { "inputSpeech", IDR_INPUT_SPEECH }, 369 { "inputSpeech", IDR_INPUT_SPEECH },
370 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, 370 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING },
371 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, 371 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING },
372 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
373 { "dinersCC", IDR_AUTOFILL_CC_DINERS },
374 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER },
375 { "genericCC", IDR_AUTOFILL_CC_GENERIC },
376 { "jcbCC", IDR_AUTOFILL_CC_JCB },
377 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
378 { "soloCC", IDR_AUTOFILL_CC_SOLO },
379 { "visaCC", IDR_AUTOFILL_CC_VISA },
380 }; 372 };
381 373
382 // Check the name prefix to see if it's an audio resource. 374 // Check the name prefix to see if it's an audio resource.
383 if (StartsWithASCII(name, "IRC_Composite", true)) { 375 if (StartsWithASCII(name, "IRC_Composite", true)) {
384 return loadAudioSpatializationResource(name); 376 return loadAudioSpatializationResource(name);
385 } else { 377 } else {
386 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) { 378 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
387 if (!strcmp(name, resources[i].name)) { 379 if (!strcmp(name, resources[i].name)) {
388 base::StringPiece resource = GetDataResource(resources[i].id); 380 base::StringPiece resource = GetDataResource(resources[i].id);
389 return WebData(resource.data(), resource.size()); 381 return WebData(resource.data(), resource.size());
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 ++shared_timer_suspended_; 573 ++shared_timer_suspended_;
582 } 574 }
583 575
584 void WebKitClientImpl::ResumeSharedTimer() { 576 void WebKitClientImpl::ResumeSharedTimer() {
585 // The shared timer may have fired or been adjusted while we were suspended. 577 // The shared timer may have fired or been adjusted while we were suspended.
586 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 578 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
587 setSharedTimerFireTime(shared_timer_fire_time_); 579 setSharedTimerFireTime(shared_timer_fire_time_);
588 } 580 }
589 581
590 } // namespace webkit_glue 582 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698