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

Unified Diff: ash/system/tray/tray_bubble_wrapper.cc

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/tray_bubble_wrapper.h ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_bubble_wrapper.cc
diff --git a/ash/system/tray/tray_bubble_wrapper.cc b/ash/system/tray/tray_bubble_wrapper.cc
index 5e92a846f10fa0e9d8be6f0c8ab44c6413b3f233..8b32282d65b296360b0f9d2faec6cf61a4dcfc23 100644
--- a/ash/system/tray/tray_bubble_wrapper.cc
+++ b/ash/system/tray/tray_bubble_wrapper.cc
@@ -5,18 +5,16 @@
#include "ash/system/tray/tray_bubble_wrapper.h"
#include "ash/system/tray/tray_background_view.h"
-#include "ash/system/tray/tray_bubble_view.h"
#include "ash/system/tray/tray_event_filter.h"
#include "ash/wm/window_properties.h"
+#include "ui/views/bubble/tray_bubble_view.h"
#include "ui/views/widget/widget.h"
-using message_center::TrayBubbleView;
-
namespace ash {
namespace internal {
TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,
- TrayBubbleView* bubble_view)
+ views::TrayBubbleView* bubble_view)
: tray_(tray),
bubble_view_(bubble_view) {
bubble_widget_ = views::BubbleDelegateView::CreateBubble(bubble_view_);
@@ -26,6 +24,7 @@ TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,
bubble_view_->InitializeAndShowBubble();
tray_->InitializeBubbleAnimations(bubble_widget_);
+ tray_->UpdateBubbleViewArrow(bubble_view_);
tray_event_filter_.reset(new TrayEventFilter(this));
}
« no previous file with comments | « ash/system/tray/tray_bubble_wrapper.h ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698