ash/system/ime/tray_ime.h - Issue 10809008: Make spacing between uber tray items consistent with UI spec.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10809008: Make spacing between uber tray items consistent with UI spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move SetTrayImageItemBorder etc to tray_views. Created 8 years, 5 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

OLD	NEW
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	7

8 #include "ash/system/ime/ime_observer.h"	8 #include "ash/system/ime/ime_observer.h"

9 #include "ash/system/tray/system_tray_item.h"	9 #include "ash/system/tray/system_tray_item.h"

10	10

(...skipping 28 matching lines...) Expand all Loading...
39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;	39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;

40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;	40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;

41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;	41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;

42 virtual views::View* CreateNotificationView(	42 virtual views::View* CreateNotificationView(

43 user::LoginStatus status) OVERRIDE;	43 user::LoginStatus status) OVERRIDE;

44 virtual void DestroyTrayView() OVERRIDE;	44 virtual void DestroyTrayView() OVERRIDE;

45 virtual void DestroyDefaultView() OVERRIDE;	45 virtual void DestroyDefaultView() OVERRIDE;

46 virtual void DestroyDetailedView() OVERRIDE;	46 virtual void DestroyDetailedView() OVERRIDE;

47 virtual void DestroyNotificationView() OVERRIDE;	47 virtual void DestroyNotificationView() OVERRIDE;

48 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;	48 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;

	49 virtual void UpdateAfterShelfAlignmentChange(

	50 ShelfAlignment alignment) OVERRIDE;

49	51

50 // Overridden from IMEObserver.	52 // Overridden from IMEObserver.

51 virtual void OnIMERefresh(bool show_message) OVERRIDE;	53 virtual void OnIMERefresh(bool show_message) OVERRIDE;

52	54

53 TrayItemView* tray_label_;	55 TrayItemView* tray_label_;

54 tray::IMEDefaultView* default_;	56 tray::IMEDefaultView* default_;

55 tray::IMEDetailedView* detailed_;	57 tray::IMEDetailedView* detailed_;

56 tray::IMENotificationView* notification_;	58 tray::IMENotificationView* notification_;

57	59

58 bool message_shown_;	60 bool message_shown_;

59	61

60 DISALLOW_COPY_AND_ASSIGN(TrayIME);	62 DISALLOW_COPY_AND_ASSIGN(TrayIME);

61 };	63 };

62	64

63 } // namespace internal	65 } // namespace internal

64 } // namespace ash	66 } // namespace ash

65	67

66 #endif // ASH_SYSTEM_IME_TRAY_IME_H_	68 #endif // ASH_SYSTEM_IME_TRAY_IME_H_

OLD	NEW

« no previous file with comments | « ash/system/date/date_view.cc ('k') | ash/system/ime/tray_ime.cc » ('j') | no next file with comments »