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

Side by Side Diff: ash/common/system/status_area_widget.h

Issue 2227143003: mash: Move AutoHideEventHandler to WmShelfAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 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
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/common/system/status_area_widget.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_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 5 #ifndef ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 6 #define ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/login_status.h" 9 #include "ash/common/login_status.h"
10 #include "ash/common/shelf/shelf_background_animator_observer.h" 10 #include "ash/common/shelf/shelf_background_animator_observer.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 // True if any message bubble is shown. 73 // True if any message bubble is shown.
74 bool IsMessageBubbleShown() const; 74 bool IsMessageBubbleShown() const;
75 75
76 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a 76 // Notifies child trays, and the |status_area_widget_delegate_| to schedule a
77 // paint. 77 // paint.
78 void SchedulePaint(); 78 void SchedulePaint();
79 79
80 // Overridden from views::Widget: 80 // Overridden from views::Widget:
81 void OnNativeWidgetActivationChanged(bool active) override; 81 void OnNativeWidgetActivationChanged(bool active) override;
82 void OnMouseEvent(ui::MouseEvent* event) override;
83 void OnGestureEvent(ui::GestureEvent* event) override;
84 82
85 // ShelfBackgroundAnimatorObserver: 83 // ShelfBackgroundAnimatorObserver:
86 void UpdateShelfItemBackground(int alpha) override; 84 void UpdateShelfItemBackground(int alpha) override;
87 85
88 private: 86 private:
89 void AddSystemTray(); 87 void AddSystemTray();
90 void AddWebNotificationTray(); 88 void AddWebNotificationTray();
91 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
92 void AddLogoutButtonTray(); 90 void AddLogoutButtonTray();
93 void AddPaletteTray(); 91 void AddPaletteTray();
(...skipping 16 matching lines...) Expand all
110 LoginStatus login_status_; 108 LoginStatus login_status_;
111 109
112 WmShelf* wm_shelf_; 110 WmShelf* wm_shelf_;
113 111
114 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget); 112 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
115 }; 113 };
116 114
117 } // namespace ash 115 } // namespace ash
118 116
119 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_ 117 #endif // ASH_COMMON_SYSTEM_STATUS_AREA_WIDGET_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/common/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698