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

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

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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: trunk/src/chrome/test/base/testing_browser_process.cc
===================================================================
--- trunk/src/chrome/test/base/testing_browser_process.cc (revision 199638)
+++ trunk/src/chrome/test/base/testing_browser_process.cc (working copy)
@@ -13,7 +13,6 @@
#include "content/public/browser/notification_service.h"
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/message_center/message_center.h"
#if !defined(OS_IOS)
#include "chrome/browser/media_galleries/media_file_system_registry.h"
@@ -37,6 +36,10 @@
#include "chrome/browser/policy/policy_service_stub.h"
#endif // defined(ENABLE_CONFIGURATION_POLICY)
+#if defined(ENABLE_MESSAGE_CENTER)
+#include "ui/message_center/message_center.h"
+#endif
+
// static
TestingBrowserProcess* TestingBrowserProcess::GetGlobal() {
return static_cast<TestingBrowserProcess*>(g_browser_process);
@@ -197,9 +200,11 @@
#endif
}
+#if defined(ENABLE_MESSAGE_CENTER)
message_center::MessageCenter* TestingBrowserProcess::message_center() {
return message_center::MessageCenter::Get();
}
+#endif
IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() {
return NULL;
« no previous file with comments | « trunk/src/chrome/test/base/testing_browser_process.h ('k') | trunk/src/chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698