Minor cleanup of a couple files:...

webkit/glue/webkitclient_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webkitclient_impl.h"
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
@@ skipping 216 matching lines @@
 void WebKitClientImpl::traceEventEnd(const char* name, void* id,
                                      const char* extra) {
   TRACE_EVENT_END(name, id, extra);
 }
 
 WebData WebKitClientImpl::loadResource(const char* name) {
   struct {
     const char* name;
     int id;
   } resources[] = {
-    { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
     { "missingImage", IDR_BROKENIMAGE },
-    { "tickmarkDash", IDR_TICKMARK_DASH },
+    { "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
+    { "mediaPlay", IDR_MEDIA_PLAY_BUTTON },
+    { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED },
+    { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED },
+    { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON },
+    { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
+    { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
+    { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
     { "panIcon", IDR_PAN_SCROLL_ICON },
     { "searchCancel", IDR_SEARCH_CANCEL },
     { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
     { "searchMagnifier", IDR_SEARCH_MAGNIFIER },
     { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
-    { "mediaPlay", IDR_MEDIA_PLAY_BUTTON },
-    { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED },
-    { "mediaPause", IDR_MEDIA_PAUSE_BUTTON },
-    { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON },
-    { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
-    { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED },
-    { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
-    { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
+    { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
+    { "tickmarkDash", IDR_TICKMARK_DASH },
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     // TODO(port): rename these to "skia" instead of "Linux".
+    { "linuxCheckboxDisabledIndeterminate",
+        IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE },
+    { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF },
+    { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON },
+    { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE },
     { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF },
     { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON },
-    { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE },
-    { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF },
-    { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON },
-    { "linuxCheckboxDisabledIndeterminate",
-      IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE },
+    { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
+    { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
     { "linuxRadioOff", IDR_LINUX_RADIO_OFF },
     { "linuxRadioOn", IDR_LINUX_RADIO_ON },
-    { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
-    { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
     { "linuxProgressBar", IDR_PROGRESS_BAR },
-    { "linuxProgressValue", IDR_PROGRESS_VALUE },
     { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT },
     { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT },
+    { "linuxProgressValue", IDR_PROGRESS_VALUE },
 #endif
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {
     if (!strcmp(name, resources[i].name)) {
       base::StringPiece resource = GetDataResource(resources[i].id);
       return WebData(resource.data(), resource.size());
     }
   }
   NOTREACHED() << "Unknown image resource " << name;
   return WebData();
@@ skipping 148 matching lines @@
   ++shared_timer_suspended_;
 }
 
 void WebKitClientImpl::ResumeSharedTimer() {
   // The shared timer may have fired or been adjusted while we were suspended.
   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
     setSharedTimerFireTime(shared_timer_fire_time_);
 }
 
 }  // namespace webkit_glue