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

Unified Diff: ash/system/status_area_widget.h

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.h
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
deleted file mode 100644
index ce4eeb0fe8ad9edfff85fd35eb3d95ec420306a4..0000000000000000000000000000000000000000
--- a/ash/system/status_area_widget.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_H_
-#define ASH_SYSTEM_STATUS_AREA_WIDGET_H_
-
-#include "ash/ash_export.h"
-#include "ash/common/login_status.h"
-#include "ash/common/shelf/shelf_types.h"
-#include "base/macros.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-class OverviewButtonTray;
-class ShellDelegate;
-class StatusAreaWidgetDelegate;
-class SystemTray;
-class WebNotificationTray;
-class WmShelf;
-class WmWindow;
-#if defined(OS_CHROMEOS)
-class LogoutButtonTray;
-class VirtualKeyboardTray;
-#endif
-
-class ASH_EXPORT StatusAreaWidget : public views::Widget {
- public:
- StatusAreaWidget(WmWindow* status_container, WmShelf* wm_shelf);
- ~StatusAreaWidget() override;
-
- // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
- void CreateTrayViews();
-
- // Destroys the system tray and web notification tray. Called before
- // tearing down the windows to avoid shutdown ordering issues.
- void Shutdown();
-
- // Update the alignment of the widget and tray views.
- void SetShelfAlignment(ShelfAlignment alignment);
-
- // Called by the client when the login status changes. Caches login_status
- // and calls UpdateAfterLoginStatusChange for the system tray and the web
- // notification tray.
- void UpdateAfterLoginStatusChange(LoginStatus login_status);
-
- StatusAreaWidgetDelegate* status_area_widget_delegate() {
- return status_area_widget_delegate_;
- }
- SystemTray* system_tray() { return system_tray_; }
- WebNotificationTray* web_notification_tray() {
- return web_notification_tray_;
- }
- OverviewButtonTray* overview_button_tray() { return overview_button_tray_; }
- WmShelf* wm_shelf() { return wm_shelf_; }
-
- LoginStatus login_status() const { return login_status_; }
-
- // Returns true if the shelf should be visible. This is used when the
- // shelf is configured to auto-hide and test if the shelf should force
- // the shelf to remain visible.
- bool ShouldShowShelf() const;
-
- // True if any message bubble is shown.
- bool IsMessageBubbleShown() const;
-
- // Notifies child trays, and the |status_area_widget_delegate_| to schedule a
- // paint.
- void SchedulePaint();
-
- // Overridden from views::Widget:
- void OnNativeWidgetActivationChanged(bool active) override;
- void OnMouseEvent(ui::MouseEvent* event) override;
- void OnGestureEvent(ui::GestureEvent* event) override;
-
- private:
- void AddSystemTray();
- void AddWebNotificationTray();
-#if defined(OS_CHROMEOS)
- void AddLogoutButtonTray();
- void AddVirtualKeyboardTray();
-#endif
- void AddOverviewButtonTray();
-
- // Weak pointers to View classes that are parented to StatusAreaWidget:
- StatusAreaWidgetDelegate* status_area_widget_delegate_;
- OverviewButtonTray* overview_button_tray_;
- SystemTray* system_tray_;
- WebNotificationTray* web_notification_tray_;
-#if defined(OS_CHROMEOS)
- LogoutButtonTray* logout_button_tray_;
- VirtualKeyboardTray* virtual_keyboard_tray_;
-#endif
- LoginStatus login_status_;
-
- WmShelf* wm_shelf_;
-
- DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);
-};
-
-} // namespace ash
-
-#endif // ASH_SYSTEM_STATUS_AREA_WIDGET_H_
« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698