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

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

Issue 17074007: Remove ActiveDesktopMonitor from DesktopNotificationsUnittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 // Real UI manager. 111 // Real UI manager.
112 scoped_ptr<BalloonNotificationUIManager> ui_manager_; 112 scoped_ptr<BalloonNotificationUIManager> ui_manager_;
113 113
114 // Real DesktopNotificationService 114 // Real DesktopNotificationService
115 scoped_ptr<DesktopNotificationService> service_; 115 scoped_ptr<DesktopNotificationService> service_;
116 116
117 #if defined(USE_ASH) 117 #if defined(USE_ASH)
118 content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox 118 content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
119 webkit_platform_support_; 119 webkit_platform_support_;
120
121 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
122 #endif 120 #endif
123 121
124 // Contains the cumulative output of the unit test. 122 // Contains the cumulative output of the unit test.
125 static std::string log_output_; 123 static std::string log_output_;
126 }; 124 };
127 125
128 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 126 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698