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

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

Issue 6287007: Clean up webkit resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, 316 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING },
317 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, 317 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING },
318 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX }, 318 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
319 { "dinersCC", IDR_AUTOFILL_CC_DINERS }, 319 { "dinersCC", IDR_AUTOFILL_CC_DINERS },
320 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER }, 320 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER },
321 { "genericCC", IDR_AUTOFILL_CC_GENERIC }, 321 { "genericCC", IDR_AUTOFILL_CC_GENERIC },
322 { "jcbCC", IDR_AUTOFILL_CC_JCB }, 322 { "jcbCC", IDR_AUTOFILL_CC_JCB },
323 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD }, 323 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
324 { "soloCC", IDR_AUTOFILL_CC_SOLO }, 324 { "soloCC", IDR_AUTOFILL_CC_SOLO },
325 { "visaCC", IDR_AUTOFILL_CC_VISA }, 325 { "visaCC", IDR_AUTOFILL_CC_VISA },
326 #if defined(OS_POSIX) && !defined(OS_MACOSX)
327 // TODO(port): rename these to "skia" instead of "Linux".
328 { "linuxCheckboxDisabledIndeterminate",
329 IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE },
330 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF },
331 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON },
332 { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE },
333 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF },
334 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON },
335 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
336 { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
337 { "linuxRadioOff", IDR_LINUX_RADIO_OFF },
338 { "linuxRadioOn", IDR_LINUX_RADIO_ON },
339 { "linuxProgressBar", IDR_PROGRESS_BAR },
340 { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT },
341 { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT },
342 { "linuxProgressValue", IDR_PROGRESS_VALUE },
343 #endif
344 }; 326 };
345 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) { 327 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
346 if (!strcmp(name, resources[i].name)) { 328 if (!strcmp(name, resources[i].name)) {
347 base::StringPiece resource = GetDataResource(resources[i].id); 329 base::StringPiece resource = GetDataResource(resources[i].id);
348 return WebData(resource.data(), resource.size()); 330 return WebData(resource.data(), resource.size());
349 } 331 }
350 } 332 }
351 // TODO(jhawkins): Restore this NOTREACHED once WK stops sending in empty 333 // TODO(jhawkins): Restore this NOTREACHED once WK stops sending in empty
352 // strings. http://crbug.com/50675. 334 // strings. http://crbug.com/50675.
353 //NOTREACHED() << "Unknown image resource " << name; 335 //NOTREACHED() << "Unknown image resource " << name;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 ++shared_timer_suspended_; 521 ++shared_timer_suspended_;
540 } 522 }
541 523
542 void WebKitClientImpl::ResumeSharedTimer() { 524 void WebKitClientImpl::ResumeSharedTimer() {
543 // The shared timer may have fired or been adjusted while we were suspended. 525 // The shared timer may have fired or been adjusted while we were suspended.
544 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 526 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
545 setSharedTimerFireTime(shared_timer_fire_time_); 527 setSharedTimerFireTime(shared_timer_fire_time_);
546 } 528 }
547 529
548 } // namespace webkit_glue 530 } // 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