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

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

Issue 9969068: ash: Animate changes in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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 | « ash/system/date/tray_date.cc ('k') | ash/system/ime/tray_ime.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 #ifndef ASH_SYSTEM_IME_TRAY_IME_H_ 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_H_
6 #define ASH_SYSTEM_IME_TRAY_IME_H_ 6 #define ASH_SYSTEM_IME_TRAY_IME_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/system/ime/ime_observer.h" 9 #include "ash/system/ime/ime_observer.h"
10 #include "ash/system/tray/system_tray_item.h" 10 #include "ash/system/tray/system_tray_item.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 12
13 namespace views { 13 namespace views {
14 class Label; 14 class Label;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
18 18
19 struct IMEInfo; 19 struct IMEInfo;
20 20
21 namespace internal { 21 namespace internal {
22 22
23 namespace tray { 23 namespace tray {
24 class IMEDefaultView; 24 class IMEDefaultView;
25 class IMEDetailedView; 25 class IMEDetailedView;
26 }; 26 };
27 27
28 class TrayItemView;
29
28 class TrayIME : public SystemTrayItem, 30 class TrayIME : public SystemTrayItem,
29 public IMEObserver { 31 public IMEObserver {
30 public: 32 public:
31 TrayIME(); 33 TrayIME();
32 virtual ~TrayIME(); 34 virtual ~TrayIME();
33 35
34 private: 36 private:
35 void UpdateTrayLabel(const IMEInfo& info, size_t count); 37 void UpdateTrayLabel(const IMEInfo& info, size_t count);
36 38
37 // Overridden from SystemTrayItem. 39 // Overridden from SystemTrayItem.
38 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
39 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 41 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
40 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 42 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
41 virtual void DestroyTrayView() OVERRIDE; 43 virtual void DestroyTrayView() OVERRIDE;
42 virtual void DestroyDefaultView() OVERRIDE; 44 virtual void DestroyDefaultView() OVERRIDE;
43 virtual void DestroyDetailedView() OVERRIDE; 45 virtual void DestroyDetailedView() OVERRIDE;
44 46
45 // Overridden from IMEObserver. 47 // Overridden from IMEObserver.
46 virtual void OnIMERefresh() OVERRIDE; 48 virtual void OnIMERefresh() OVERRIDE;
47 49
48 scoped_ptr<views::Label> tray_label_; 50 scoped_ptr<TrayItemView> tray_label_;
49 scoped_ptr<tray::IMEDefaultView> default_; 51 scoped_ptr<tray::IMEDefaultView> default_;
50 scoped_ptr<tray::IMEDetailedView> detailed_; 52 scoped_ptr<tray::IMEDetailedView> detailed_;
51 53
52 DISALLOW_COPY_AND_ASSIGN(TrayIME); 54 DISALLOW_COPY_AND_ASSIGN(TrayIME);
53 }; 55 };
54 56
55 } // namespace internal 57 } // namespace internal
56 } // namespace ash 58 } // namespace ash
57 59
58 #endif // ASH_SYSTEM_IME_TRAY_IME_H_ 60 #endif // ASH_SYSTEM_IME_TRAY_IME_H_
OLDNEW
« no previous file with comments | « ash/system/date/tray_date.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698