diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 19:27:52 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 19:27:52 +0000 |
commit | 652727def58ab808755d4fe9930acdf783482596 (patch) | |
tree | 69e5fa7c6188ea144bbd27b2f50ed5261b4af228 /webkit | |
parent | f87591e53e63812e918442f1013ab86bbbc4f84e (diff) | |
download | chromium_src-652727def58ab808755d4fe9930acdf783482596.zip chromium_src-652727def58ab808755d4fe9930acdf783482596.tar.gz chromium_src-652727def58ab808755d4fe9930acdf783482596.tar.bz2 |
Minor cleanup of a couple files: sort arrays of resource IDs into order (to match .grds which were recently sorted into order).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2941004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webcursor_win.cc | 18 | ||||
-rw-r--r-- | webkit/glue/webkitclient_impl.cc | 34 |
2 files changed, 26 insertions, 26 deletions
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index 7dfe41e..4435e06 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2009 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. +// 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 "base/logging.h" #include "base/pickle.h" @@ -111,18 +111,18 @@ static WebCursorInfo::Type ToCursorType(HCURSOR cursor) { WebCursorInfo::Type type; } kStandardCursors[] = { { LoadCursor(NULL, IDC_ARROW), WebCursorInfo::TypePointer }, + { LoadCursor(NULL, IDC_CROSS), WebCursorInfo::TypeCross }, + { LoadCursor(NULL, IDC_HAND), WebCursorInfo::TypeHand }, { LoadCursor(NULL, IDC_IBEAM), WebCursorInfo::TypeIBeam }, { LoadCursor(NULL, IDC_WAIT), WebCursorInfo::TypeWait }, - { LoadCursor(NULL, IDC_CROSS), WebCursorInfo::TypeCross }, - { LoadCursor(NULL, IDC_SIZENWSE), WebCursorInfo::TypeNorthWestResize }, + { LoadCursor(NULL, IDC_HELP), WebCursorInfo::TypeHelp }, { LoadCursor(NULL, IDC_SIZENESW), WebCursorInfo::TypeNorthEastResize }, - { LoadCursor(NULL, IDC_SIZEWE), WebCursorInfo::TypeEastWestResize }, + { LoadCursor(NULL, IDC_SIZENWSE), WebCursorInfo::TypeNorthWestResize }, { LoadCursor(NULL, IDC_SIZENS), WebCursorInfo::TypeNorthSouthResize }, + { LoadCursor(NULL, IDC_SIZEWE), WebCursorInfo::TypeEastWestResize }, { LoadCursor(NULL, IDC_SIZEALL), WebCursorInfo::TypeMove }, - { LoadCursor(NULL, IDC_NO), WebCursorInfo::TypeNotAllowed }, - { LoadCursor(NULL, IDC_HAND), WebCursorInfo::TypeHand }, { LoadCursor(NULL, IDC_APPSTARTING), WebCursorInfo::TypeProgress }, - { LoadCursor(NULL, IDC_HELP), WebCursorInfo::TypeHelp }, + { LoadCursor(NULL, IDC_NO), WebCursorInfo::TypeNotAllowed }, }; for (int i = 0; i < arraysize(kStandardCursors); i++) { if (cursor == kStandardCursors[i].cursor) diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 1132c54..b05e7d9f 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -234,39 +234,39 @@ WebData WebKitClientImpl::loadResource(const char* name) { const char* name; int id; } resources[] = { - { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, { "missingImage", IDR_BROKENIMAGE }, - { "tickmarkDash", IDR_TICKMARK_DASH }, - { "panIcon", IDR_PAN_SCROLL_ICON }, - { "searchCancel", IDR_SEARCH_CANCEL }, - { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, - { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, - { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, + { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, { "mediaPlay", IDR_MEDIA_PLAY_BUTTON }, { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED }, - { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, + { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, { "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 }, + { "panIcon", IDR_PAN_SCROLL_ICON }, + { "searchCancel", IDR_SEARCH_CANCEL }, + { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, + { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, + { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, + { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, + { "tickmarkDash", IDR_TICKMARK_DASH }, #if defined(OS_POSIX) && !defined(OS_MACOSX) // TODO(port): rename these to "skia" instead of "Linux". - { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, - { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, - { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE }, + { "linuxCheckboxDisabledIndeterminate", + IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE }, { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, - { "linuxCheckboxDisabledIndeterminate", - IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE }, - { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, - { "linuxRadioOn", IDR_LINUX_RADIO_ON }, + { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE }, + { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, + { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON }, + { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, + { "linuxRadioOn", IDR_LINUX_RADIO_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) { |