diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 17:02:12 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-21 17:02:12 +0000 |
| commit | c6fa07212403400534708111c0e7907af4299f5b (patch) | |
| tree | 9bb27664fae14cba92cf1706582f474409e7ebf3 | |
| parent | 4926e54ada598ecce30237b2e4d0ad5580709536 (diff) | |
| download | chromium_src-c6fa07212403400534708111c0e7907af4299f5b.zip chromium_src-c6fa07212403400534708111c0e7907af4299f5b.tar.gz chromium_src-c6fa07212403400534708111c0e7907af4299f5b.tar.bz2 | |
Fix search engine dialog top image for RTL languages. The search engine dialog shows an image of the omnibox at the top of the dialog box; in RTL languages, this image needs to be reversed and moved to the left.
BUG=52769
TEST=search engine dialog looks correct in RTL languages.
Review URL: http://codereview.chromium.org/3198006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56997 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 1 | ||||
| -rw-r--r-- | chrome/browser/views/first_run_search_engine_view.cc | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 8556768..fa2bab1 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -263,6 +263,7 @@ <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" /> <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_DIALOG_TOP" file="search_engine_top.png" type="BINDATA" /> + <include name="IDR_SEARCH_ENGINE_DIALOG_TOP_RTL" file="search_engine_top_rtl.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_OTHER" file="notused.png" type="BINDATA" /> <if expr="pp_ifdef('_google_chrome')"> <include name="IDR_SEARCH_ENGINE_LOGO_ABCSOK" file="google_chrome/search_abcsok.png" type="BINDATA" /> diff --git a/chrome/browser/views/first_run_search_engine_view.cc b/chrome/browser/views/first_run_search_engine_view.cc index f5da1e2..30947db 100644 --- a/chrome/browser/views/first_run_search_engine_view.cc +++ b/chrome/browser/views/first_run_search_engine_view.cc @@ -244,7 +244,13 @@ void FirstRunSearchEngineView::SetupControls() { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); background_image_ = new views::ImageView(); - background_image_->SetImage(rb.GetBitmapNamed(IDR_SEARCH_ENGINE_DIALOG_TOP)); + if (text_direction_is_rtl_) { + background_image_->SetImage(rb.GetBitmapNamed( + IDR_SEARCH_ENGINE_DIALOG_TOP_RTL)); + } else { + background_image_->SetImage(rb.GetBitmapNamed( + IDR_SEARCH_ENGINE_DIALOG_TOP)); + } background_image_->SetHorizontalAlignment(ImageView::TRAILING); AddChildView(background_image_); |