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

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

Issue 10960060: fix "IME changed" notification uses a wrong field of IME (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: resource ids; more cases Created 8 years, 3 months 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
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('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/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 views::Label* GetLabel() { 212 views::Label* GetLabel() {
213 SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate(); 213 SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
214 IMEInfo current; 214 IMEInfo current;
215 delegate->GetCurrentIME(&current); 215 delegate->GetCurrentIME(&current);
216 216
217 // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for 217 // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for
218 // third party IMEs 218 // third party IMEs
219 return new views::Label( 219 return new views::Label(
220 l10n_util::GetStringFUTF16( 220 l10n_util::GetStringFUTF16(
221 IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE, 221 IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
222 current.short_name)); 222 current.medium_name));
223 } 223 }
224 224
225 225
226 int autoclose_delay_; 226 int autoclose_delay_;
227 base::OneShotTimer<IMENotificationView> autoclose_; 227 base::OneShotTimer<IMENotificationView> autoclose_;
228 228
229 DISALLOW_COPY_AND_ASSIGN(IMENotificationView); 229 DISALLOW_COPY_AND_ASSIGN(IMENotificationView);
230 }; 230 };
231 231
232 232
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 notification_->UpdateLabel(); 337 notification_->UpdateLabel();
338 } else if (!Shell::GetInstance()->shelf()->IsVisible() || !message_shown_) { 338 } else if (!Shell::GetInstance()->shelf()->IsVisible() || !message_shown_) {
339 ShowNotificationView(); 339 ShowNotificationView();
340 message_shown_ = true; 340 message_shown_ = true;
341 } 341 }
342 } 342 }
343 } 343 }
344 344
345 } // namespace internal 345 } // namespace internal
346 } // namespace ash 346 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698