diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 10:41:57 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 10:41:57 +0000 |
| commit | 7cce32386c8c7b26ad4ea4d40714e4d23c59d71a (patch) | |
| tree | ecfbbb10126ac7c618a24b9ad9f6a53f60cb24e3 /content | |
| parent | 05aad2da76c3041ffa80c961e225aa12abfc1fc0 (diff) | |
| download | chromium_src-7cce32386c8c7b26ad4ea4d40714e4d23c59d71a.zip chromium_src-7cce32386c8c7b26ad4ea4d40714e4d23c59d71a.tar.gz chromium_src-7cce32386c8c7b26ad4ea4d40714e4d23c59d71a.tar.bz2 | |
Allow building without notification support.
BUG=None
TEST=Existing
Review URL: http://codereview.chromium.org/8396043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_renderer.gypi | 6 | ||||
| -rw-r--r-- | content/content_tests.gypi | 5 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 0fb27b7..8ed9fa4 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -227,6 +227,12 @@ 'renderer/speech_input_dispatcher.h', ] }], + ['notifications==0', { + 'sources!': [ + 'renderer/notification_provider.cc', + 'renderer/active_notification_tracker.cc', + ], + }], ], 'dependencies': [ '../build/linux/system.gyp:gtk', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 5044aca..c8fb0eb 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -209,6 +209,11 @@ ['exclude', '^browser/speech/'], ] }], + ['notifications==0', { + 'sources!': [ + 'renderer/active_notification_tracker_unittest.cc', + ], + }], ['use_x11 == 1', { 'dependencies': [ '../build/linux/system.gyp:dbus', diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index ad9cf5e..749aa25 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -361,7 +361,12 @@ RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd, } intents_dispatcher_ = new IntentsDispatcher(this); + +#if defined(ENABLE_NOTIFICATIONS) notification_provider_ = new NotificationProvider(this); +#else + notification_provider_ = NULL; +#endif RenderThread::Get()->AddRoute(routing_id_, this); // Take a reference on behalf of the RenderThread. This will be balanced |