Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: ash/system/ime/tray_ime.cc

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix remaining Label::Alignment references. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/drive/tray_drive.cc ('k') | ash/system/locale/tray_locale.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/ime/tray_ime.h" 5 #include "ash/system/ime/tray_ime.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 IMEInfo current; 215 IMEInfo current;
216 delegate->GetCurrentIME(&current); 216 delegate->GetCurrentIME(&current);
217 217
218 // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for 218 // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for
219 // third party IMEs 219 // third party IMEs
220 views::Label* label = new views::Label( 220 views::Label* label = new views::Label(
221 l10n_util::GetStringFUTF16( 221 l10n_util::GetStringFUTF16(
222 IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE, 222 IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
223 current.medium_name)); 223 current.medium_name));
224 label->SetMultiLine(true); 224 label->SetMultiLine(true);
225 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 225 label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
226 return label; 226 return label;
227 } 227 }
228 228
229 229
230 int autoclose_delay_; 230 int autoclose_delay_;
231 base::OneShotTimer<IMENotificationView> autoclose_; 231 base::OneShotTimer<IMENotificationView> autoclose_;
232 232
233 DISALLOW_COPY_AND_ASSIGN(IMENotificationView); 233 DISALLOW_COPY_AND_ASSIGN(IMENotificationView);
234 }; 234 };
235 235
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() || 342 } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() ||
343 !message_shown_) { 343 !message_shown_) {
344 ShowNotificationView(); 344 ShowNotificationView();
345 message_shown_ = true; 345 message_shown_ = true;
346 } 346 }
347 } 347 }
348 } 348 }
349 349
350 } // namespace internal 350 } // namespace internal
351 } // namespace ash 351 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/drive/tray_drive.cc ('k') | ash/system/locale/tray_locale.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698