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

Side by Side Diff: chrome/browser/task_manager/task_manager_notification_browsertest.cc

Issue 12712018: Fixing problem with incomplete browser windows showing up after task manager was used (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed again. Done. Created 7 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 #include "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/notifications/desktop_notification_service.h" 10 #include "chrome/browser/notifications/desktop_notification_service.h"
11 #include "chrome/browser/notifications/notification.h" 11 #include "chrome/browser/notifications/notification.h"
12 #include "chrome/browser/notifications/notification_test_util.h" 12 #include "chrome/browser/notifications/notification_test_util.h"
13 #include "chrome/browser/notifications/notification_ui_manager.h" 13 #include "chrome/browser/notifications/notification_ui_manager.h"
14 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 14 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
15 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_dialogs.h"
16 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
18 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
20 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
21 22
22 #if !defined(ENABLE_MESSAGE_CENTER) 23 #if !defined(ENABLE_MESSAGE_CENTER)
23 // These tests do not apply with Message Center platforms 24 // These tests do not apply with Message Center platforms
24 // where notifications do not instantiate a new renderer. 25 // where notifications do not instantiate a new renderer.
25 26
(...skipping 17 matching lines...) Expand all
43 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 44 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
44 #define MAYBE_NoticeNotificationChanges DISABLED_NoticeNotificationChanges 45 #define MAYBE_NoticeNotificationChanges DISABLED_NoticeNotificationChanges
45 #else 46 #else
46 #define MAYBE_NoticeNotificationChanges NoticeNotificationChanges 47 #define MAYBE_NoticeNotificationChanges NoticeNotificationChanges
47 #endif 48 #endif
48 IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest, 49 IN_PROC_BROWSER_TEST_F(TaskManagerNotificationBrowserTest,
49 MAYBE_NoticeNotificationChanges) { 50 MAYBE_NoticeNotificationChanges) {
50 EXPECT_EQ(0, model()->ResourceCount()); 51 EXPECT_EQ(0, model()->ResourceCount());
51 52
52 // Show the task manager. 53 // Show the task manager.
53 browser()->window()->ShowTaskManager(); 54 chrome::ShowTaskManager(browser(), false);
54 // Expect to see the browser and the New Tab Page renderer. 55 // Expect to see the browser and the New Tab Page renderer.
55 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); 56 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
56 57
57 // Show a notification. 58 // Show a notification.
58 NotificationUIManager* notifications = 59 NotificationUIManager* notifications =
59 g_browser_process->notification_ui_manager(); 60 g_browser_process->notification_ui_manager();
60 61
61 string16 content = DesktopNotificationService::CreateDataUrl( 62 string16 content = DesktopNotificationService::CreateDataUrl(
62 GURL(), ASCIIToUTF16("Hello World!"), string16(), 63 GURL(), ASCIIToUTF16("Hello World!"), string16(),
63 WebKit::WebTextDirectionDefault); 64 WebKit::WebTextDirectionDefault);
64 65
65 scoped_refptr<NotificationDelegate> del1(new MockNotificationDelegate("n1")); 66 scoped_refptr<NotificationDelegate> del1(new MockNotificationDelegate("n1"));
66 Notification n1( 67 Notification n1(
67 GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get()); 68 GURL(), GURL(content), ASCIIToUTF16("Test 1"), string16(), del1.get());
68 scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2")); 69 scoped_refptr<NotificationDelegate> del2(new MockNotificationDelegate("n2"));
69 Notification n2( 70 Notification n2(
70 GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get()); 71 GURL(), GURL(content), ASCIIToUTF16("Test 2"), string16(), del2.get());
71 72
72 notifications->Add(n1, browser()->profile()); 73 notifications->Add(n1, browser()->profile());
73 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 74 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
74 notifications->Add(n2, browser()->profile()); 75 notifications->Add(n2, browser()->profile());
75 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3); 76 TaskManagerBrowserTestUtil::WaitForWebResourceChange(3);
76 notifications->CancelById(n1.notification_id()); 77 notifications->CancelById(n1.notification_id());
77 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 78 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
78 notifications->CancelById(n2.notification_id()); 79 notifications->CancelById(n2.notification_id());
79 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); 80 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
80 } 81 }
81 82
82 #endif // !ENABLE_MESSAGE_CENTER 83 #endif // !ENABLE_MESSAGE_CENTER
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698