Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ | 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ |
| 6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ | 6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| 11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/prefs/testing_pref_service.h" | 12 #include "base/prefs/testing_pref_service.h" |
| 13 #include "chrome/browser/notifications/balloon_collection_impl.h" | 13 #include "chrome/browser/notifications/balloon_collection_impl.h" |
| 14 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" | 14 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" |
| 15 #include "chrome/browser/notifications/desktop_notification_service.h" | 15 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 16 #include "chrome/browser/notifications/notification.h" | 16 #include "chrome/browser/notifications/notification.h" |
| 17 #include "chrome/browser/notifications/notification_test_util.h" | 17 #include "chrome/browser/notifications/notification_test_util.h" |
| 18 #include "chrome/test/base/testing_browser_process.h" | 18 #include "chrome/test/base/testing_browser_process.h" |
| 19 #include "chrome/test/base/testing_profile.h" | 19 #include "chrome/test/base/testing_profile.h" |
| 20 #include "content/public/test/render_view_test.h" | 20 #include "content/public/test/render_view_test.h" |
| 21 #include "content/public/test/test_browser_thread.h" | 21 #include "content/public/test/test_browser_thread.h" |
| 22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
| 23 | 23 |
| 24 #if defined(OS_WIN) | |
|
dewittj
2014/03/03 22:48:55
Probably should read:
defined(OS_WIN) && defined(U
| |
| 25 #include "base/win/scoped_com_initializer.h" | |
| 26 #endif | |
| 27 | |
| 24 #if defined(USE_AURA) | 28 #if defined(USE_AURA) |
| 25 namespace views { | 29 namespace views { |
| 26 namespace corewm { | 30 namespace corewm { |
| 27 class WMState; | 31 class WMState; |
| 28 } | 32 } |
| 29 } | 33 } |
| 30 #endif | 34 #endif |
| 31 | 35 |
| 32 class ActiveDesktopMonitor; | 36 class ActiveDesktopMonitor; |
| 33 class DesktopNotificationsTest; | 37 class DesktopNotificationsTest; |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 127 // Real DesktopNotificationService | 131 // Real DesktopNotificationService |
| 128 scoped_ptr<DesktopNotificationService> service_; | 132 scoped_ptr<DesktopNotificationService> service_; |
| 129 | 133 |
| 130 // Contains the cumulative output of the unit test. | 134 // Contains the cumulative output of the unit test. |
| 131 static std::string log_output_; | 135 static std::string log_output_; |
| 132 | 136 |
| 133 private: | 137 private: |
| 134 #if defined(USE_AURA) | 138 #if defined(USE_AURA) |
| 135 scoped_ptr<views::corewm::WMState> wm_state_; | 139 scoped_ptr<views::corewm::WMState> wm_state_; |
| 136 #endif | 140 #endif |
| 141 #if defined(OS_WIN) | |
|
dewittj
2014/03/03 22:48:55
same here
| |
| 142 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_; | |
| 143 #endif | |
| 137 | 144 |
| 138 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest); | 145 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest); |
| 139 }; | 146 }; |
| 140 | 147 |
| 141 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ | 148 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ |
| OLD | NEW |