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

Side by Side Diff: ash/system/network/tray_network.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
« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/network/tray_network.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_NETWORK_TRAY_NETWORK_H 5 #ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
7 7
8 #include "ash/system/network/network_observer.h" 8 #include "ash/system/network/network_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 31 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 32 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 33 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
34 virtual views::View* CreateNotificationView( 34 virtual views::View* CreateNotificationView(
35 user::LoginStatus status) OVERRIDE; 35 user::LoginStatus status) OVERRIDE;
36 virtual void DestroyTrayView() OVERRIDE; 36 virtual void DestroyTrayView() OVERRIDE;
37 virtual void DestroyDefaultView() OVERRIDE; 37 virtual void DestroyDefaultView() OVERRIDE;
38 virtual void DestroyDetailedView() OVERRIDE; 38 virtual void DestroyDetailedView() OVERRIDE;
39 virtual void DestroyNotificationView() OVERRIDE; 39 virtual void DestroyNotificationView() OVERRIDE;
40 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 40 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
41 virtual void UpdateAfterShelfAlignmentChange(
42 ShelfAlignment alignment) OVERRIDE;
41 43
42 // Overridden from NetworkObserver. 44 // Overridden from NetworkObserver.
43 virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE; 45 virtual void OnNetworkRefresh(const NetworkIconInfo& info) OVERRIDE;
44 virtual void SetNetworkError(NetworkTrayDelegate* delegate, 46 virtual void SetNetworkError(NetworkTrayDelegate* delegate,
45 ErrorType error_type, 47 ErrorType error_type,
46 const string16& title, 48 const string16& title,
47 const string16& message, 49 const string16& message,
48 const string16& link_text) OVERRIDE; 50 const string16& link_text) OVERRIDE;
49 virtual void ClearNetworkError(ErrorType error_type) OVERRIDE; 51 virtual void ClearNetworkError(ErrorType error_type) OVERRIDE;
50 52
(...skipping 11 matching lines...) Expand all
62 tray::NetworkNotificationView* notification_; 64 tray::NetworkNotificationView* notification_;
63 scoped_ptr<tray::NetworkErrors> errors_; 65 scoped_ptr<tray::NetworkErrors> errors_;
64 66
65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 67 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
66 }; 68 };
67 69
68 } // namespace internal 70 } // namespace internal
69 } // namespace ash 71 } // namespace ash
70 72
71 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H 73 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H
OLDNEW
« no previous file with comments | « ash/system/ime/tray_ime.cc ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698