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

Unified Diff: ash/system/tray/system_tray_bubble.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.cc ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_bubble.h
diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h
index eede02c1bbc1b48e9c7b6307bfa004078eb1cbb9..73edaac5e7205e8ed4b080b3f3286fd6c7d39072 100644
--- a/ash/system/tray/system_tray_bubble.h
+++ b/ash/system/tray/system_tray_bubble.h
@@ -5,11 +5,11 @@
#ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
#define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
-#include "ash/system/tray/tray_bubble_view.h"
#include "ash/system/user/login_status.h"
#include "base/base_export.h"
#include "base/memory/scoped_ptr.h"
#include "base/timer.h"
+#include "ui/views/bubble/tray_bubble_view.h"
#include <vector>
@@ -41,10 +41,10 @@ class SystemTrayBubble {
// Also creates |bubble_wrapper_|. |init_params| may be modified.
void InitView(views::View* anchor,
user::LoginStatus login_status,
- message_center::TrayBubbleView::InitParams* init_params);
+ views::TrayBubbleView::InitParams* init_params);
BubbleType bubble_type() const { return bubble_type_; }
- message_center::TrayBubbleView* bubble_view() const { return bubble_view_; }
+ views::TrayBubbleView* bubble_view() const { return bubble_view_; }
void DestroyItemViews();
void BubbleViewDestroyed();
@@ -63,7 +63,7 @@ class SystemTrayBubble {
void CreateItemViews(user::LoginStatus login_status);
ash::SystemTray* tray_;
- message_center::TrayBubbleView* bubble_view_;
+ views::TrayBubbleView* bubble_view_;
std::vector<ash::SystemTrayItem*> items_;
BubbleType bubble_type_;
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/system_tray_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698