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

Side by Side Diff: ash/system/tray/system_tray.h

Issue 9594011: ash uber tray: Make the tray background rounded. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')
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_TRAY_SYSTEM_TRAY_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
(...skipping 30 matching lines...) Expand all
41 // Updates the items when the login status of the system changes. 41 // Updates the items when the login status of the system changes.
42 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 42 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
43 43
44 const std::vector<SystemTrayItem*>& items() const { return items_; } 44 const std::vector<SystemTrayItem*>& items() const { return items_; }
45 45
46 private: 46 private:
47 void ShowItems(std::vector<SystemTrayItem*>& items, bool details); 47 void ShowItems(std::vector<SystemTrayItem*>& items, bool details);
48 48
49 // Overridden from views::View. 49 // Overridden from views::View.
50 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 50 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
51 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
52 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
51 53
52 // Overridden from views::Widget::Observer. 54 // Overridden from views::Widget::Observer.
53 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 55 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
54 56
55 std::vector<SystemTrayItem*> items_; 57 std::vector<SystemTrayItem*> items_;
56 58
57 // The popup widget and the delegate. 59 // The popup widget and the delegate.
58 internal::SystemTrayBubble* bubble_; 60 internal::SystemTrayBubble* bubble_;
59 views::Widget* popup_; 61 views::Widget* popup_;
60 62
61 DISALLOW_COPY_AND_ASSIGN(SystemTray); 63 DISALLOW_COPY_AND_ASSIGN(SystemTray);
62 }; 64 };
63 65
64 } // namespace ash 66 } // namespace ash
65 67
66 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 68 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/system_tray.cc » ('j') | ash/system/tray/system_tray.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698