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

Unified Diff: ash/system/web_notification/ash_popup_alignment_delegate.h

Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, rename SetSystemTrayHeight to SetTrayBubbleHeight Created 4 years, 6 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
Index: ash/system/web_notification/ash_popup_alignment_delegate.h
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h
deleted file mode 100644
index 7d1f2f49c7e6595d30efc1c741c2fd1134587ee6..0000000000000000000000000000000000000000
--- a/ash/system/web_notification/ash_popup_alignment_delegate.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2014 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_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
-#define ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
-
-#include <stdint.h>
-
-#include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_types.h"
-#include "ash/common/shelf/wm_shelf_observer.h"
-#include "ash/common/shell_observer.h"
-#include "base/macros.h"
-#include "ui/display/display_observer.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/message_center/views/popup_alignment_delegate.h"
-
-namespace display {
-class Screen;
-}
-
-namespace ash {
-
-class AshPopupAlignmentDelegateTest;
-class ShelfLayoutManager;
-class WebNotificationTrayTest;
-class WmShelf;
-
-// The PopupAlignmentDelegate subclass for Ash. It needs to handle alignment of
-// the shelf and its autohide state.
-class ASH_EXPORT AshPopupAlignmentDelegate
- : public message_center::PopupAlignmentDelegate,
- public WmShelfObserver,
- public ShellObserver,
- public display::DisplayObserver {
- public:
- explicit AshPopupAlignmentDelegate(WmShelf* shelf);
- ~AshPopupAlignmentDelegate() override;
-
- // Start observing the system.
- void StartObserving(display::Screen* screen, const display::Display& display);
-
- // Sets the current height of the system tray so that the notification toasts
- // can avoid it.
- void SetSystemTrayHeight(int height);
-
- // Returns the current system tray height.
- int system_tray_height_for_test() const { return system_tray_height_; }
-
- // Overridden from message_center::PopupAlignmentDelegate:
- int GetToastOriginX(const gfx::Rect& toast_bounds) const override;
- int GetBaseLine() const override;
- int GetWorkAreaBottom() const override;
- bool IsTopDown() const override;
- bool IsFromLeft() const override;
- void RecomputeAlignment(const display::Display& display) override;
- void ConfigureWidgetInitParamsForContainer(
- views::Widget* widget,
- views::Widget::InitParams* init_params) override;
-
- private:
- friend class AshPopupAlignmentDelegateTest;
- friend class WebNotificationTrayTest;
-
- // Get the current alignment of the shelf.
- ShelfAlignment GetAlignment() const;
-
- // Utility function to get the display which should be care about.
- display::Display GetCurrentDisplay() const;
-
- // Compute the new work area.
- void UpdateWorkArea();
-
- // Overridden from ShellObserver:
- void OnDisplayWorkAreaInsetsChanged() override;
-
- // WmShelfObserver:
- void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
- void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
-
- // Overridden from display::DisplayObserver:
- void OnDisplayAdded(const display::Display& new_display) override;
- void OnDisplayRemoved(const display::Display& old_display) override;
- void OnDisplayMetricsChanged(const display::Display& display,
- uint32_t metrics) override;
-
- display::Screen* screen_;
- gfx::Rect work_area_;
- WmShelf* shelf_;
- int system_tray_height_;
-
- DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegate);
-};
-
-} // namespace ash
-
-#endif // ASH_SYSTEM_WEB_NOTIFICATION_ASH_POPUP_ALIGNMENT_DELEGATE_H_
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698