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

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

Issue 10830114: Show the IME notification if the system shelf is hidden (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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"
11 #include "ash/system/tray/system_tray_delegate.h" 11 #include "ash/system/tray/system_tray_delegate.h"
12 #include "ash/system/tray/tray_constants.h" 12 #include "ash/system/tray/tray_constants.h"
13 #include "ash/system/tray/tray_details_view.h" 13 #include "ash/system/tray/tray_details_view.h"
14 #include "ash/system/tray/tray_item_more.h" 14 #include "ash/system/tray/tray_item_more.h"
15 #include "ash/system/tray/tray_item_view.h" 15 #include "ash/system/tray/tray_item_view.h"
16 #include "ash/system/tray/tray_notification_view.h" 16 #include "ash/system/tray/tray_notification_view.h"
17 #include "ash/system/tray/tray_views.h" 17 #include "ash/system/tray/tray_views.h"
18 #include "ash/wm/shelf_layout_manager.h"
18 #include "base/logging.h" 19 #include "base/logging.h"
19 #include "base/timer.h" 20 #include "base/timer.h"
20 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
21 #include "grit/ash_strings.h" 22 #include "grit/ash_strings.h"
22 #include "grit/ui_resources.h" 23 #include "grit/ui_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/gfx/font.h" 26 #include "ui/gfx/font.h"
26 #include "ui/gfx/image/image.h" 27 #include "ui/gfx/image/image.h"
27 #include "ui/views/controls/label.h" 28 #include "ui/views/controls/label.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 delegate->GetAvailableIMEList(&list); 313 delegate->GetAvailableIMEList(&list);
313 delegate->GetCurrentIMEProperties(&property_list); 314 delegate->GetCurrentIMEProperties(&property_list);
314 315
315 UpdateTrayLabel(current, list.size()); 316 UpdateTrayLabel(current, list.size());
316 317
317 if (default_) 318 if (default_)
318 default_->UpdateLabel(current); 319 default_->UpdateLabel(current);
319 if (detailed_) 320 if (detailed_)
320 detailed_->Update(list, property_list); 321 detailed_->Update(list, property_list);
321 322
322 if (list.size() > 1 && show_message && !message_shown_) { 323 if (list.size() > 1 && show_message) {
323 if (!notification_) { 324 // If the notification is still visible, hide it and clear the flag so it is
325 // refreshed.
326 if (notification_) {
327 HideNotificationView();
sadrul 2012/08/01 15:00:41 Can we update the existing notification instead of
Zachary Kuznia 2012/08/02 01:51:18 Done.
328 message_shown_ = false;
329 }
330
331 if (!Shell::GetInstance()->shelf()->IsVisible() || !message_shown_) {
324 ShowNotificationView(); 332 ShowNotificationView();
325 message_shown_ = true; 333 message_shown_ = true;
326 } 334 }
327 } 335 }
328 } 336 }
329 337
330 } // namespace internal 338 } // namespace internal
331 } // namespace ash 339 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698