summaryrefslogtreecommitdiffstats
path: root/ash/system/ime
diff options
context:
space:
mode:
authordzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 13:17:17 +0000
committerdzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 13:17:17 +0000
commitd7ffac75143b8ca0ba900844360f1c6583d36b0d (patch)
tree1c8d4210bd6786d695fa6cdb4910dc3dcdb95a40 /ash/system/ime
parent1ddf5f18253195a96ff84e4eb2ac9428b7939da6 (diff)
downloadchromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.zip
chromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.tar.gz
chromium_src-d7ffac75143b8ca0ba900844360f1c6583d36b0d.tar.bz2
Implemented system tray UI for new account management.
* Added new mode in TrayUser for the case when new account management is enabled (--new-profile-management flag). In fact TrayUser is now supporting four different modes, depending of states of |multi-profiles| flag and |new-profile-management| flag. * Massive refactoring were made in tray_user.cc to isolate UserCardView creation in separate class and make code more clear. * UI for the cases when new account management is disabled remained without changes. Known issues: * There are no tests for new UI. Hopefully old UI is covered by tests already. * New UI is not accessible yet. * Stub implementation of UserAccountsDelegate is used for backend. BUG=344844 TEST=manually Review URL: https://codereview.chromium.org/210903003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/ime')
-rw-r--r--ash/system/ime/tray_ime.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index b1ffb28..dd73065 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -100,7 +100,9 @@ class IMEDetailedView : public TrayDetailsView,
CreateScrollableList();
for (size_t i = 0; i < list.size(); i++) {
HoverHighlightView* container = new HoverHighlightView(this);
- container->AddLabel(list[i].name,
+ container->AddLabel(
+ list[i].name,
+ gfx::ALIGN_LEFT,
list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL);
scroll_content()->AddChildView(container);
ime_map_[container] = list[i].id;
@@ -113,6 +115,7 @@ class IMEDetailedView : public TrayDetailsView,
HoverHighlightView* container = new HoverHighlightView(this);
container->AddLabel(
property_list[i].name,
+ gfx::ALIGN_LEFT,
property_list[i].selected ? gfx::Font::BOLD : gfx::Font::NORMAL);
if (i == 0)
container->SetBorder(views::Border::CreateSolidSidedBorder(
@@ -124,8 +127,10 @@ class IMEDetailedView : public TrayDetailsView,
void AppendSettings() {
HoverHighlightView* container = new HoverHighlightView(this);
- container->AddLabel(ui::ResourceBundle::GetSharedInstance().
- GetLocalizedString(IDS_ASH_STATUS_TRAY_IME_SETTINGS),
+ container->AddLabel(
+ ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+ IDS_ASH_STATUS_TRAY_IME_SETTINGS),
+ gfx::ALIGN_LEFT,
gfx::Font::NORMAL);
AddChildView(container);
settings_ = container;