Commit c6fa0721 authored by mirandac@chromium.org's avatar mirandac@chromium.org

Fix search engine dialog top image for RTL languages. The search engine...

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
parent 4926e54a
...@@ -263,6 +263,7 @@ ...@@ -263,6 +263,7 @@
<include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" /> <include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
<include name="IDR_SAD_TAB" file="sadtab.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" 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" /> <include name="IDR_SEARCH_ENGINE_LOGO_OTHER" file="notused.png" type="BINDATA" />
<if expr="pp_ifdef('_google_chrome')"> <if expr="pp_ifdef('_google_chrome')">
<include name="IDR_SEARCH_ENGINE_LOGO_ABCSOK" file="google_chrome/search_abcsok.png" type="BINDATA" /> <include name="IDR_SEARCH_ENGINE_LOGO_ABCSOK" file="google_chrome/search_abcsok.png" type="BINDATA" />
......
...@@ -244,7 +244,13 @@ void FirstRunSearchEngineView::SetupControls() { ...@@ -244,7 +244,13 @@ void FirstRunSearchEngineView::SetupControls() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); ResourceBundle& rb = ResourceBundle::GetSharedInstance();
background_image_ = new views::ImageView(); 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); background_image_->SetHorizontalAlignment(ImageView::TRAILING);
AddChildView(background_image_); AddChildView(background_image_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment