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

Unified Diff: ash/system/tray/tray_background_view.h

Issue 11229022: Move ash/system/web_notification message_center to ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 2 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/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_background_view.h
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index f95a8a255f1d89dd5023754f01416e6d4a51009f..3a828ec9e545e8f67db195c292c5f214d3780672 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -7,9 +7,9 @@
#include "ash/ash_export.h"
#include "ash/launcher/background_animator.h"
-#include "ash/system/tray/tray_bubble_view.h"
#include "ash/system/tray/tray_views.h"
#include "ash/wm/shelf_types.h"
+#include "ui/views/bubble/tray_bubble_view.h"
namespace ash {
namespace internal {
@@ -87,8 +87,7 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
// Hides the bubble associated with |bubble_view|. Called when the widget
// is closed.
- virtual void HideBubbleWithView(
- const message_center::TrayBubbleView* bubble_view) = 0;
+ virtual void HideBubbleWithView(const views::TrayBubbleView* bubble_view) = 0;
// Called by the bubble wrapper when a click event occurs outside the bubble.
// May close the bubble. Returns true if the event is handled.
@@ -115,11 +114,11 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
// Returns the anchor rect for the bubble.
gfx::Rect GetBubbleAnchorRect(
views::Widget* anchor_widget,
- message_center::TrayBubbleView::AnchorType anchor_type,
- message_center::TrayBubbleView::AnchorAlignment anchor_alignment) const;
+ views::TrayBubbleView::AnchorType anchor_type,
+ views::TrayBubbleView::AnchorAlignment anchor_alignment) const;
// Returns the bubble anchor alignment based on |shelf_alignment_|.
- message_center::TrayBubbleView::AnchorAlignment GetAnchorAlignment() const;
+ views::TrayBubbleView::AnchorAlignment GetAnchorAlignment() const;
StatusAreaWidget* status_area_widget() {
return status_area_widget_;
@@ -132,6 +131,9 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
ShelfLayoutManager* GetShelfLayoutManager();
+ // Updates the arrow visibilty based on the launcher visibilty.
+ void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
+
private:
class TrayWidgetObserver;
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698