From 6e080596ece8b739b0a4a3dc528d91a561e31879 Mon Sep 17 00:00:00 2001 From: "sky@google.com" Date: Fri, 5 Sep 2008 20:39:47 +0000 Subject: Fixes keyword editor to show error image when keyword isn't valid. BUG=1318 TEST=Edit a keyword in the keyword editor. Change the keyword to one that is being used by another keyword. Make sure the icon updates appropriately. Review URL: http://codereview.chromium.org/258 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1803 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/theme/theme_resources.h | 2 +- chrome/app/theme/theme_resources.rc | 1 - chrome/browser/views/edit_keyword_controller.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/chrome/app/theme/theme_resources.h b/chrome/app/theme/theme_resources.h index f3fc518..242bf45 100644 --- a/chrome/app/theme/theme_resources.h +++ b/chrome/app/theme/theme_resources.h @@ -291,7 +291,7 @@ #define IDR_HOME_P 9360 #define IDR_FIND_BOX_BACKGROUND_LEFT_RTL 9361 #define IDR_INPUT_GOOD 9362 -#define IDR_INPUT_NONE 9363 +// 9363 is unused. #define IDR_INPUT_ALERT 9364 #define IDR_HISTORY_FAVICON 9365 #define IDR_DOWNLOADS_FAVICON 9366 diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc index 18b6cef..8f78a69 100644 --- a/chrome/app/theme/theme_resources.rc +++ b/chrome/app/theme/theme_resources.rc @@ -283,7 +283,6 @@ IDR_HOME BINDATA "home.png" IDR_HOME_H BINDATA "home_h.png" IDR_HOME_P BINDATA "home_p.png" IDR_INPUT_GOOD BINDATA "input_good.png" -IDR_INPUT_NONE BINDATA "input_good.png" IDR_INPUT_ALERT BINDATA "input_alert.png" IDR_HISTORY_FAVICON BINDATA "history_favicon.png" IDR_DOWNLOADS_FAVICON BINDATA "downloads_favicon.png" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 308b7f6..63cffaa 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -354,7 +354,7 @@ void EditKeywordController::UpdateImageView(ImageView* image_view, image_view->SetTooltipText(l10n_util::GetString(invalid_message_id)); image_view->SetImage( ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_INPUT_NONE)); + IDR_INPUT_ALERT)); } } -- cgit v1.1