diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:25:02 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 07:25:02 +0000 |
| commit | 578c81bf2adf9cb973f6a8e759a81bbdf5416226 (patch) | |
| tree | d58c67c0d302abaa157d1f94a6f80f964b9b6294 /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | a0e1adc59387bb3560c3b36c64a180fc4ff9eab7 (diff) | |
| download | chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.zip chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.tar.gz chromium_src-578c81bf2adf9cb973f6a8e759a81bbdf5416226.tar.bz2 | |
Remove old (pre-webkit) compositor
BUG=103948
TEST=builds, tests pass
Review URL: http://codereview.chromium.org/9288053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index ee54d05..0e41994 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,9 +12,7 @@ #include "content/public/common/show_desktop_notification_params.h" #if defined(USE_AURA) -#if defined(USE_WEBKIT_COMPOSITOR) #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" -#endif #include "ui/aura/root_window.h" #endif @@ -92,9 +90,7 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { void DesktopNotificationsTest::SetUp() { #if defined(USE_AURA) -#if defined(USE_WEBKIT_COMPOSITOR) WebKit::initialize(&webkit_platform_support_); -#endif // MockBalloonCollection retrieves information about the screen on creation. // So it is necessary to make sure the desktop gets created first. aura::RootWindow::GetInstance(); @@ -115,10 +111,8 @@ void DesktopNotificationsTest::TearDown() { profile_.reset(NULL); #if defined(USE_AURA) aura::RootWindow::DeleteInstance(); -#if defined(USE_WEBKIT_COMPOSITOR) WebKit::shutdown(); #endif -#endif } content::ShowDesktopNotificationHostMsgParams |