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

Side by Side Diff: chrome/browser/notifications/desktop_notifications_unittest.h

Issue 188693004: Revert of Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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) && defined(USE_ASH)
25 #include "base/win/scoped_com_initializer.h"
26 #endif
27
28 #if defined(USE_AURA) 24 #if defined(USE_AURA)
29 namespace views { 25 namespace views {
30 namespace corewm { 26 namespace corewm {
31 class WMState; 27 class WMState;
32 } 28 }
33 } 29 }
34 #endif 30 #endif
35 31
36 class ActiveDesktopMonitor; 32 class ActiveDesktopMonitor;
37 class DesktopNotificationsTest; 33 class DesktopNotificationsTest;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // Real DesktopNotificationService 127 // Real DesktopNotificationService
132 scoped_ptr<DesktopNotificationService> service_; 128 scoped_ptr<DesktopNotificationService> service_;
133 129
134 // Contains the cumulative output of the unit test. 130 // Contains the cumulative output of the unit test.
135 static std::string log_output_; 131 static std::string log_output_;
136 132
137 private: 133 private:
138 #if defined(USE_AURA) 134 #if defined(USE_AURA)
139 scoped_ptr<views::corewm::WMState> wm_state_; 135 scoped_ptr<views::corewm::WMState> wm_state_;
140 #endif 136 #endif
141 #if defined(OS_WIN) && defined(USE_ASH)
142 scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
143 #endif
144 137
145 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest); 138 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest);
146 }; 139 };
147 140
148 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 141 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
OLDNEW
« no previous file with comments | « ash/system/win/audio/tray_audio_win.cc ('k') | chrome/browser/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698