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

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 11958025: Start delegating notifications to MessageCenter on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: another build fix Created 7 years, 11 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 | « chrome/test/base/testing_browser_process.h ('k') | ui/message_center/message_center.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index c5814373665e787f7b92743a668e1ef32e533edc..b955d4b3e77817d9897794843684fe2189da3fef 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -30,6 +30,14 @@
#include "chrome/browser/policy/policy_service_stub.h"
#endif // defined(ENABLE_CONFIGURATION_POLICY)
+#if defined(ENABLE_MESSAGE_CENTER) && defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center.h"
+#endif
+
// static
TestingBrowserProcess* TestingBrowserProcess::GetGlobal() {
return static_cast<TestingBrowserProcess*>(g_browser_process);
@@ -188,6 +196,18 @@ NotificationUIManager* TestingBrowserProcess::notification_ui_manager() {
#endif
}
+#if defined(ENABLE_MESSAGE_CENTER)
+message_center::MessageCenter* TestingBrowserProcess::message_center() {
+#if defined(USE_ASH)
+ return ash::Shell::GetInstance()->message_center();
+#else
+ if (!message_center_.get())
+ message_center_.reset(new message_center::MessageCenter());
+ return message_center_.get();
+#endif
+}
+#endif
+
IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() {
return NULL;
}
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | ui/message_center/message_center.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698