diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 17:56:37 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 17:56:37 +0000 |
| commit | 9725e6e2e7779be0ce10fe42443735dac8145149 (patch) | |
| tree | fada5d4743525416e935406a8cf573722d8b73f4 /ash/system/ime | |
| parent | efd3b9e8d4b409c7dd7537e36b016e586dbcbac6 (diff) | |
| download | chromium_src-9725e6e2e7779be0ce10fe42443735dac8145149.zip chromium_src-9725e6e2e7779be0ce10fe42443735dac8145149.tar.gz chromium_src-9725e6e2e7779be0ce10fe42443735dac8145149.tar.bz2 | |
Put IME properties to scroll_content.
BUG=129117
TEST=manually on lumpy
Review URL: https://chromiumcodereview.appspot.com/10414058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/ime')
| -rw-r--r-- | ash/system/ime/tray_ime.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 3eff738..6f79ebf 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -105,21 +105,18 @@ class IMEDetailedView : public TrayDetailsView, void AppendIMEProperties(const IMEPropertyInfoList& property_list) { property_map_.clear(); - views::View* properties = new views::View; - properties->SetLayoutManager(new views::BoxLayout( - views::BoxLayout::kVertical, 0, 0, 1)); for (size_t i = 0; i < property_list.size(); i++) { HoverHighlightView* container = new HoverHighlightView(this); container->set_fixed_height(kTrayPopupItemHeight); container->AddLabel( property_list[i].name, property_list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL); - properties->AddChildView(container); + if (i == 0) + container->set_border(views::Border::CreateSolidSidedBorder(1, 0, 0, 0, + kBorderLightColor)); + scroll_content()->AddChildView(container); property_map_[container] = property_list[i].key; } - properties->set_border(views::Border::CreateSolidSidedBorder( - 0, 0, 1, 0, kBorderLightColor)); - AddChildView(properties); } void AppendSettings() { |